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

* keyserver.c (parse_keyserver_uri): Accept "http" as an alias for "hkp",

Browse Source 
since it is occasionally written that way.

* mainproc.c (check_sig_and_print): Grammar fix ;)
This commit is contained in:
David Shaw 2003-06-19 03:39:37 +00:00
parent f80c14b8ef
commit 36fce8bd93
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,5 +1,10 @@
2003-06-18 David Shaw <dshaw@jabberwocky.com> 2003-06-18 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (parse_keyserver_uri): Accept "http" as an alias for
"hkp", since it is occasionally written that way.
* mainproc.c (check_sig_and_print): Grammar fix ;)
* keygen.c (ask_user_id): Make --allow-freeform-uid apply to the * keygen.c (ask_user_id): Make --allow-freeform-uid apply to the
email field as well as the name field, and allow mixing fields email field as well as the name field, and allow mixing fields
when it is set. when it is set.

3
g10/keyserver.c
View File

@ -156,7 +156,8 @@ parse_keyserver_uri(char *uri,const char *configname,unsigned int configlineno)
opt.keyserver_scheme="hkp"; opt.keyserver_scheme="hkp";
opt.keyserver_options.broken_http_proxy=1; opt.keyserver_options.broken_http_proxy=1;
} }
else if(ascii_strcasecmp(opt.keyserver_scheme,"x-hkp")==0) else if(ascii_strcasecmp(opt.keyserver_scheme,"x-hkp")==0
|| ascii_strcasecmp(opt.keyserver_scheme,"http")==0)
{ {
/* Canonicalize this to "hkp" so it works with both the internal /* Canonicalize this to "hkp" so it works with both the internal
and external keyserver interface. */ and external keyserver interface. */

6
g10/mainproc.c
View File

@ -1325,7 +1325,11 @@ check_sig_and_print( CTX c, KBNODE node )
while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&n,&seq,NULL))) while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&n,&seq,NULL)))
{ {
log_info(_("Key available from: ") ); /* According to my favorite copy editor, in English
grammar, you say "at" if the key is located on a web
page, but "from" if it is located on a keyserver. I'm
not going to even try to make two strings here :) */
log_info(_("Key available at: ") );
print_string( log_stream(), p, n, 0 ); print_string( log_stream(), p, n, 0 );
putc( '\n', log_stream() ); putc( '\n', log_stream() );
} }