mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-09 12:54:23 +01:00
* mainproc.c (check_sig_and_print), keyserver.c
(keyserver_import_pka), card-util.c (fetch_url): Always require a scheme:// for keyserver URLs except when used as part of the --keyserver command for backwards compatibility.
This commit is contained in:
parent
5bce704dd3
commit
1315171b07
@ -1,5 +1,10 @@
|
|||||||
2006-01-01 David Shaw <dshaw@jabberwocky.com>
|
2006-01-01 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* mainproc.c (check_sig_and_print), keyserver.c
|
||||||
|
(keyserver_import_pka), card-util.c (fetch_url): Always require a
|
||||||
|
scheme:// for keyserver URLs except when used as part of the
|
||||||
|
--keyserver command for backwards compatibility.
|
||||||
|
|
||||||
* sign.c (write_signature_packets): Lost a digest_algo line.
|
* sign.c (write_signature_packets): Lost a digest_algo line.
|
||||||
|
|
||||||
* sign.c (hash_for): Add code to detect if the sk lives on a smart
|
* sign.c (hash_for): Add code to detect if the sk lives on a smart
|
||||||
|
@ -623,7 +623,7 @@ fetch_url(void)
|
|||||||
gpg_strerror(rc));
|
gpg_strerror(rc));
|
||||||
else if (info.pubkey_url && *info.pubkey_url)
|
else if (info.pubkey_url && *info.pubkey_url)
|
||||||
{
|
{
|
||||||
spec=parse_keyserver_uri(info.pubkey_url,0,NULL,0);
|
spec=parse_keyserver_uri(info.pubkey_url,1,NULL,0);
|
||||||
if(spec && info.fpr1valid)
|
if(spec && info.fpr1valid)
|
||||||
{
|
{
|
||||||
/* This is not perfectly right. Currently, all card
|
/* This is not perfectly right. Currently, all card
|
||||||
|
@ -1979,7 +1979,7 @@ keyserver_import_pka(const char *name)
|
|||||||
if (uri)
|
if (uri)
|
||||||
{
|
{
|
||||||
struct keyserver_spec *spec;
|
struct keyserver_spec *spec;
|
||||||
spec = parse_keyserver_uri (uri, 0, NULL, 0);
|
spec = parse_keyserver_uri (uri, 1, NULL, 0);
|
||||||
if (spec)
|
if (spec)
|
||||||
{
|
{
|
||||||
rc=keyserver_import_fprint (fpr, 20, spec);
|
rc=keyserver_import_fprint (fpr, 20, spec);
|
||||||
|
@ -1529,7 +1529,7 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||||||
int res;
|
int res;
|
||||||
struct keyserver_spec *spec;
|
struct keyserver_spec *spec;
|
||||||
|
|
||||||
spec = parse_keyserver_uri (uri, 0, NULL, 0);
|
spec = parse_keyserver_uri (uri, 1, NULL, 0);
|
||||||
if (spec)
|
if (spec)
|
||||||
{
|
{
|
||||||
glo_ctrl.in_auto_key_retrieve++;
|
glo_ctrl.in_auto_key_retrieve++;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user