security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

gpg: Replace use of "gpg2" by GPG_NAME

Browse Source 
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-04-05 11:10:09 +02:00
parent 96bcd4220f
commit 7b58a1118d
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
g10/gpgcompose.c
View File

@ -553,7 +553,7 @@ static struct option user_id_options[] = {
"\"Name (comment) <email@example.org>\"" }, "\"Name (comment) <email@example.org>\"" },
{ NULL, NULL, { NULL, NULL,
"Example:\n\n" "Example:\n\n"
" $ gpgcompose --user-id \"USERID\" | gpg2 --list-packets" } " $ gpgcompose --user-id \"USERID\" | " GPG_NAME " --list-packets" }
}; };
static int static int
@ -662,7 +662,7 @@ static struct option pk_options[] = {
{ NULL, NULL, { NULL, NULL,
"Example:\n\n" "Example:\n\n"
" $ gpgcompose --public-key $KEYID --user-id \"USERID\" \\\n" " $ gpgcompose --public-key $KEYID --user-id \"USERID\" \\\n"
" | gpg2 --list-packets" } " | " GPG_NAME " --list-packets" }
}; };
static int static int
@ -1554,7 +1554,7 @@ static struct option sig_options[] = {
"Example:\n\n" "Example:\n\n"
" $ gpgcompose --public-key $KEYID --user-id USERID \\\n" " $ gpgcompose --public-key $KEYID --user-id USERID \\\n"
" --signature --class 0x10 --issuer $KEYID --issuer-keyid self \\\n" " --signature --class 0x10 --issuer $KEYID --issuer-keyid self \\\n"
" | gpg2 --list-packets"} " | " GPG_NAME " --list-packets"}
}; };
static int static int
@ -2146,12 +2146,12 @@ static struct option sk_esk_options[] = {
"password. The session key may be prefaced with an integer and a colon " "password. The session key may be prefaced with an integer and a colon "
"to indicate the cipher to use for the SED packet (making --sed-cipher " "to indicate the cipher to use for the SED packet (making --sed-cipher "
"unnecessary and allowing the direct use of the result of " "unnecessary and allowing the direct use of the result of "
"\"gpg2 --show-session-key\")." }, "\"" GPG_NAME " --show-session-key\")." },
{ "", sk_esk_password, "The password." }, { "", sk_esk_password, "The password." },
{ NULL, NULL, { NULL, NULL,
"Example:\n\n" "Example:\n\n"
" $ gpgcompose --sk-esk foobar --encrypted \\\n" " $ gpgcompose --sk-esk foobar --encrypted \\\n"
" --literal --value foo | gpg2 --list-packets" } " --literal --value foo | " GPG_NAME " --list-packets" }
}; };
static int static int
@ -2388,14 +2388,14 @@ static struct option pk_esk_options[] = {
"then a new session key is generated. The session key may be " "then a new session key is generated. The session key may be "
"prefaced with an integer and a colon to indicate the cipher to use " "prefaced with an integer and a colon to indicate the cipher to use "
"for the SED packet (making --sed-cipher unnecessary and allowing the " "for the SED packet (making --sed-cipher unnecessary and allowing the "
"direct use of the result of \"gpg2 --show-session-key\")." }, "direct use of the result of \"" GPG_NAME " --show-session-key\")." },
{ "--throw-keyid", pk_esk_throw_keyid, { "--throw-keyid", pk_esk_throw_keyid,
"Throw the keyid." }, "Throw the keyid." },
{ "", pk_esk_keyid, "The key id." }, { "", pk_esk_keyid, "The key id." },
{ NULL, NULL, { NULL, NULL,
"Example:\n\n" "Example:\n\n"
" $ gpgcompose --pk-esk $KEYID --encrypted --literal --value foo \\\n" " $ gpgcompose --pk-esk $KEYID --encrypted --literal --value foo \\\n"
" | gpg2 --list-packets"} " | " GPG_NAME " --list-packets"}
}; };
static int static int
@ -2494,14 +2494,14 @@ static struct option encrypted_options[] = {
"string. If this is not given or is \"auto\", then the last session key " "string. If this is not given or is \"auto\", then the last session key "
"is used. If there was none, then an error is raised. The session key " "is used. If there was none, then an error is raised. The session key "
"must be prefaced with an integer and a colon to indicate the cipher " "must be prefaced with an integer and a colon to indicate the cipher "
"to use (this is format used by \"gpg2 --show-session-key\")." }, "to use (this is format used by \"" GPG_NAME " --show-session-key\")." },
{ NULL, NULL, { NULL, NULL,
"After creating the packet, this command clears the current " "After creating the packet, this command clears the current "
"session key.\n\n" "session key.\n\n"
"Example: nested encryption packets:\n\n" "Example: nested encryption packets:\n\n"
" $ gpgcompose --sk-esk foo --encrypted-mdc \\\n" " $ gpgcompose --sk-esk foo --encrypted-mdc \\\n"
" --sk-esk bar --encrypted-mdc \\\n" " --sk-esk bar --encrypted-mdc \\\n"
" --literal --value 123 --encrypted-pop --encrypted-pop | gpg2 -d" } " --literal --value 123 --encrypted-pop --encrypted-pop | " GPG_NAME" -d" }
}; };
static int static int
@ -2743,7 +2743,7 @@ static struct option literal_options[] = {
"The literal's name." }, "The literal's name." },
{ NULL, NULL, { NULL, NULL,
"Example:\n\n" "Example:\n\n"
" $ gpgcompose --literal --value foobar | gpg2 -d"} " $ gpgcompose --literal --value foobar | " GPG_NAME " -d"}
}; };
static int static int

7
g10/t-stutter.c
View File

@ -37,12 +37,13 @@
* *
* How to generate a test message: * How to generate a test message:
* *
* $ echo 0123456789abcdefghijklmnopqrstuvwxyz | gpg2 --disable-mdc -z 0 -c > msg.asc * $ echo 0123456789abcdefghijklmnopqrstuvwxyz | \
* $ gpg2 --list-packets msg.asc * gpg --disable-mdc -z 0 -c > msg.asc
* $ gpg --list-packets msg.asc
* # Make sure the encryption packet contains a literal packet (without * # Make sure the encryption packet contains a literal packet (without
* # any nesting). * # any nesting).
* $ gpgsplit msg.asc * $ gpgsplit msg.asc
* $ gpg2 --show-session-key -d msg.asc * $ gpg --show-session-key -d msg.asc
* $ ./t-stutter --debug SESSION_KEY 000002-009.encrypted * $ ./t-stutter --debug SESSION_KEY 000002-009.encrypted
*/ */

4
g10/trustdb.c
View File

@ -421,13 +421,13 @@ how_to_fix_the_trustdb ()
log_info (_("You may try to re-create the trustdb using the commands:\n")); log_info (_("You may try to re-create the trustdb using the commands:\n"));
log_info (" cd %s\n", default_homedir ()); log_info (" cd %s\n", default_homedir ());
log_info (" gpg2 --export-ownertrust > otrust.tmp\n"); log_info (" %s --export-ownertrust > otrust.tmp\n", GPG_NAME);
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
log_info (" del %s\n", name); log_info (" del %s\n", name);
#else #else
log_info (" rm %s\n", name); log_info (" rm %s\n", name);
#endif #endif
log_info (" gpg2 --import-ownertrust < otrust.tmp\n"); log_info (" %s --import-ownertrust < otrust.tmp\n", GPG_NAME);
log_info (_("If that does not work, please consult the manual\n")); log_info (_("If that does not work, please consult the manual\n"));
} }