[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.19-40-g978878b
by Werner Koch
cvs at cvs.gnupg.org
Tue Nov 27 19:07:19 CET 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, STABLE-BRANCH-2-0 has been updated
via 978878b1be0be5bdce7b1bbc7dc9fa39ce8aa402 (commit)
from ab4ea45f54006eba55db11263431c4c0c4f557dc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 978878b1be0be5bdce7b1bbc7dc9fa39ce8aa402
Author: Werner Koch <wk at gnupg.org>
Date: Tue Nov 27 17:35:16 2012 +0100
Fix printing of ECC algo names in hkp keyserver listings.
* g10/misc.c (map_pk_openpgp_to_gcry): New.
* g10/keyserver.c (print_keyrec): Map OpenPGP algorithm ids.
--
Although we don't have support for ECC, we want to print a proper
algorithm name in keyserver listings. This will only work while using
a ECC enabled Libgcrypt. Problem reported by Kristian Fiskerstrand.
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 36c52f0..90e9000 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -483,9 +483,10 @@ print_keyrec(int number,struct keyrec *keyrec)
if(keyrec->type)
{
- const char *str = gcry_pk_algo_name (keyrec->type);
+ const char *str;
- if(str)
+ str = gcry_pk_algo_name (map_pk_openpgp_to_gcry (keyrec->type));
+ if(str && strcmp (str, "?"))
printf("%s ",str);
else
printf("unknown ");
@@ -662,7 +663,7 @@ parse_keyrec(char *keystring)
case 'R':
work->flags|=1;
break;
-
+
case 'd':
case 'D':
work->flags|=2;
@@ -867,7 +868,7 @@ keyserver_search_prompt(IOBUF buffer,const char *searchstr)
if (opt.with_colons && opt.batch)
break;
-
+
for(;;)
{
if(show_prompt(desc,i,validcount?count:0,localstr))
@@ -921,7 +922,7 @@ keyserver_search_prompt(IOBUF buffer,const char *searchstr)
/* Leave this commented out or now, and perhaps for a very long
time. All HKPish servers return HTML error messages for
no-key-found. */
- /*
+ /*
if(!started)
log_info(_("keyserver does not support searching\n"));
else
@@ -974,7 +975,7 @@ direct_uri_map(const char *scheme,unsigned int is_direct)
#define KEYSERVER_ARGS_KEEP " -o \"%O\" \"%I\""
#define KEYSERVER_ARGS_NOKEEP " -o \"%o\" \"%i\""
-static int
+static int
keyserver_spawn(enum ks_action action,strlist_t list,KEYDB_SEARCH_DESC *desc,
int count,int *prog,unsigned char **fpr,size_t *fpr_len,
struct keyserver_spec *keyserver)
@@ -1014,7 +1015,7 @@ keyserver_spawn(enum ks_action action,strlist_t list,KEYDB_SEARCH_DESC *desc,
the program of this process lives. Fortunately Windows provides
a way to retrieve this and our gnupg_libexecdir function has been
modified to return just this. Setting the exec-path is not
- anymore required.
+ anymore required.
set_exec_path(libexecdir);
*/
#else
@@ -1044,7 +1045,7 @@ keyserver_spawn(enum ks_action action,strlist_t list,KEYDB_SEARCH_DESC *desc,
fetcher that can speak that protocol (this is a problem for
LDAP). */
- strcat(command,GPGKEYS_PREFIX);
+ strcat(command,GPGKEYS_PREFIX);
strcat(command,scheme);
/* This "_uri" thing is in case we need to call a direct handler
@@ -1074,7 +1075,7 @@ keyserver_spawn(enum ks_action action,strlist_t list,KEYDB_SEARCH_DESC *desc,
{
command=xrealloc(command,strlen(command)+
strlen(KEYSERVER_ARGS_NOKEEP)+1);
- strcat(command,KEYSERVER_ARGS_NOKEEP);
+ strcat(command,KEYSERVER_ARGS_NOKEEP);
}
ret=exec_write(&spawn,NULL,command,NULL,0,0);
@@ -1525,7 +1526,7 @@ keyserver_spawn(enum ks_action action,strlist_t list,KEYDB_SEARCH_DESC *desc,
return ret;
}
-static int
+static int
keyserver_work(enum ks_action action,strlist_t list,KEYDB_SEARCH_DESC *desc,
int count,unsigned char **fpr,size_t *fpr_len,
struct keyserver_spec *keyserver)
@@ -1595,7 +1596,7 @@ keyserver_work(enum ks_action action,strlist_t list,KEYDB_SEARCH_DESC *desc,
#endif /* ! DISABLE_KEYSERVER_HELPERS*/
}
-int
+int
keyserver_export(strlist_t users)
{
strlist_t sl=NULL;
@@ -1627,7 +1628,7 @@ keyserver_export(strlist_t users)
return rc;
}
-int
+int
keyserver_import(strlist_t users)
{
KEYDB_SEARCH_DESC *desc;
@@ -1687,7 +1688,7 @@ keyserver_import_fprint(const byte *fprint,size_t fprint_len,
return keyserver_work(KS_GET,NULL,&desc,1,NULL,NULL,keyserver);
}
-int
+int
keyserver_import_keyid(u32 *keyid,struct keyserver_spec *keyserver)
{
KEYDB_SEARCH_DESC desc;
@@ -1702,7 +1703,7 @@ keyserver_import_keyid(u32 *keyid,struct keyserver_spec *keyserver)
}
/* code mostly stolen from do_export_stream */
-static int
+static int
keyidlist(strlist_t users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
{
int rc=0,ndesc,num=100;
@@ -1725,10 +1726,10 @@ keyidlist(strlist_t users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
}
else
{
- for (ndesc=0, sl=users; sl; sl = sl->next, ndesc++)
+ for (ndesc=0, sl=users; sl; sl = sl->next, ndesc++)
;
desc = xmalloc ( ndesc * sizeof *desc);
-
+
for (ndesc=0, sl=users; sl; sl = sl->next)
{
if(classify_user_id (sl->d, desc+ndesc))
@@ -1741,7 +1742,7 @@ keyidlist(strlist_t users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
while (!(rc = keydb_search (kdbhd, desc, ndesc)))
{
- if (!users)
+ if (!users)
desc[0].mode = KEYDB_SEARCH_MODE_NEXT;
/* read the keyblock */
@@ -1844,7 +1845,7 @@ keyidlist(strlist_t users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
if(rc==-1)
rc=0;
-
+
leave:
if(rc)
xfree(*klist);
@@ -2176,7 +2177,7 @@ keyserver_import_ldap(const char *name,unsigned char **fpr,size_t *fpr_len)
snprintf(port,7,":%u",srvlist[i].port);
strcat(keyserver->host,port);
}
-
+
strcat(keyserver->host," ");
}
@@ -2192,7 +2193,7 @@ keyserver_import_ldap(const char *name,unsigned char **fpr,size_t *fpr_len)
strcat(keyserver->host,domain);
append_to_strlist(&list,name);
-
+
rc=keyserver_work(KS_GETNAME,list,NULL,0,fpr,fpr_len,keyserver);
free_strlist(list);
diff --git a/g10/main.h b/g10/main.h
index 3a42137..35c9373 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -89,6 +89,7 @@ int map_cipher_openpgp_to_gcry (int algo);
int openpgp_cipher_blocklen (int algo);
int openpgp_cipher_test_algo( int algo );
const char *openpgp_cipher_algo_name (int algo);
+int map_pk_openpgp_to_gcry (int algo);
int openpgp_pk_test_algo( int algo );
int openpgp_pk_test_algo2 ( int algo, unsigned int use );
int openpgp_pk_algo_usage ( int algo );
@@ -113,7 +114,7 @@ char *pct_expando(const char *string,struct expando_args *args);
void deprecated_warning(const char *configname,unsigned int configlineno,
const char *option,const char *repl1,const char *repl2);
void deprecated_command (const char *name);
-void obsolete_option (const char *configname, unsigned int configlineno,
+void obsolete_option (const char *configname, unsigned int configlineno,
const char *name);
int string_to_cipher_algo (const char *string);
@@ -266,7 +267,7 @@ void import_print_stats (void *hd);
int collapse_uids( KBNODE *keyblock );
-int auto_create_card_key_stub ( const char *serialnostr,
+int auto_create_card_key_stub ( const char *serialnostr,
const unsigned char *fpr1,
const unsigned char *fpr2,
const unsigned char *fpr3);
diff --git a/g10/misc.c b/g10/misc.c
index 8cc63ba..1a937f1 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -40,7 +40,7 @@
#ifdef HAVE_W32_SYSTEM
#include <time.h>
#include <process.h>
-#include <windows.h>
+#include <windows.h>
#include <shlobj.h>
#ifndef CSIDL_APPDATA
#define CSIDL_APPDATA 0x001a
@@ -81,7 +81,7 @@ string_count_chr (const char *string, int c)
#ifdef ENABLE_SELINUX_HACKS
/* A object and a global variable to keep track of files marked as
secured. */
-struct secured_file_item
+struct secured_file_item
{
struct secured_file_item *next;
ino_t ino;
@@ -106,7 +106,7 @@ register_secured_file (const char *fname)
/* Note that we stop immediatley if something goes wrong here. */
if (stat (fname, &buf))
- log_fatal (_("fstat of `%s' failed in %s: %s\n"), fname,
+ log_fatal (_("fstat of `%s' failed in %s: %s\n"), fname,
"register_secured_file", strerror (errno));
/* log_debug ("registering `%s' i=%lu.%lu\n", fname, */
/* (unsigned long)buf.st_dev, (unsigned long)buf.st_ino); */
@@ -160,8 +160,8 @@ unregister_secured_file (const char *fname)
}
/* Return true if FD is corresponds to a secured file. Using -1 for
- FS is allowed and will return false. */
-int
+ FS is allowed and will return false. */
+int
is_secured_file (int fd)
{
#ifdef ENABLE_SELINUX_HACKS
@@ -175,7 +175,7 @@ is_secured_file (int fd)
secure if something went wrong. */
if (fstat (fd, &buf))
{
- log_error (_("fstat(%d) failed in %s: %s\n"), fd,
+ log_error (_("fstat(%d) failed in %s: %s\n"), fd,
"is_secured_file", strerror (errno));
return 1;
}
@@ -195,8 +195,8 @@ is_secured_file (int fd)
/* Return true if FNAME is corresponds to a secured file. Using NULL,
"" or "-" for FS is allowed and will return false. This function is
used before creating a file, thus it won't fail if the file does
- not exist. */
-int
+ not exist. */
+int
is_secured_filename (const char *fname)
{
#ifdef ENABLE_SELINUX_HACKS
@@ -204,7 +204,7 @@ is_secured_filename (const char *fname)
struct secured_file_item *sf;
if (iobuf_is_pipe_filename (fname) || !*fname)
- return 0;
+ return 0;
/* Note that we print out a error here and claim that a file is
secure if something went wrong. */
@@ -345,9 +345,9 @@ map_cipher_openpgp_to_gcry (int algo)
{
switch (algo)
{
- case CIPHER_ALGO_CAMELLIA128: return 310;
- case CIPHER_ALGO_CAMELLIA192: return 311;
- case CIPHER_ALGO_CAMELLIA256: return 312;
+ case CIPHER_ALGO_CAMELLIA128: return 310;
+ case CIPHER_ALGO_CAMELLIA192: return 311;
+ case CIPHER_ALGO_CAMELLIA256: return 312;
default: return algo;
}
}
@@ -367,7 +367,7 @@ map_cipher_gcry_to_openpgp (int algo)
/* Return the block length of an OpenPGP cipher algorithm. */
-int
+int
openpgp_cipher_blocklen (int algo)
{
/* We use the numbers from OpenPGP to be sure that we get the right
@@ -407,18 +407,33 @@ openpgp_cipher_test_algo( int algo )
string representation of the algorithm name. For unknown algorithm
IDs this function returns "?". */
const char *
-openpgp_cipher_algo_name (int algo)
+openpgp_cipher_algo_name (int algo)
{
return gcry_cipher_algo_name (map_cipher_openpgp_to_gcry (algo));
}
+
+/* Map OpenPGP public key algorithm numbers to those used by
+ Libgcrypt. */
+int
+map_pk_openpgp_to_gcry (int algo)
+{
+ switch (algo)
+ {
+ case PUBKEY_ALGO_ECDSA: return 301 /*GCRY_PK_ECDSA*/;
+ case PUBKEY_ALGO_ECDH: return 302 /*GCRY_PK_ECDH*/;
+ default: return algo;
+ }
+}
+
+
int
openpgp_pk_test_algo( int algo )
{
/* Dont't allow type 20 keys unless in rfc2440 mode. */
if (!RFC2440 && algo == 20)
return gpg_error (GPG_ERR_PUBKEY_ALGO);
-
+
if (algo == GCRY_PK_ELG_E)
algo = GCRY_PK_ELG;
@@ -445,13 +460,13 @@ openpgp_pk_test_algo2( int algo, unsigned int use )
return gcry_pk_algo_info (algo, GCRYCTL_TEST_ALGO, NULL, &use_buf);
}
-int
+int
openpgp_pk_algo_usage ( int algo )
{
- int use = 0;
-
+ int use = 0;
+
/* They are hardwired in gpg 1.0. */
- switch ( algo ) {
+ switch ( algo ) {
case PUBKEY_ALGO_RSA:
use = (PUBKEY_USAGE_CERT | PUBKEY_USAGE_SIG
| PUBKEY_USAGE_ENC | PUBKEY_USAGE_AUTH);
@@ -469,7 +484,7 @@ openpgp_pk_algo_usage ( int algo )
case PUBKEY_ALGO_ELGAMAL_E:
use = PUBKEY_USAGE_ENC;
break;
- case PUBKEY_ALGO_DSA:
+ case PUBKEY_ALGO_DSA:
use = PUBKEY_USAGE_CERT | PUBKEY_USAGE_SIG | PUBKEY_USAGE_AUTH;
break;
default:
@@ -509,7 +524,7 @@ idea_cipher_warn(int show)
#endif
-static unsigned long
+static unsigned long
get_signature_count (PKT_secret_key *sk)
{
#ifdef ENABLE_CARD_SUPPORT
@@ -518,7 +533,7 @@ get_signature_count (PKT_secret_key *sk)
struct agent_card_info_s info;
if(agent_scd_getattr("SIG-COUNTER",&info)==0)
return info.sig_counter;
- }
+ }
#endif
/* How to do this without a card? */
@@ -609,7 +624,7 @@ pct_expando(const char *string,struct expando_args *args)
sprintf(&ret[idx],"%lu",get_signature_count(args->sk));
idx+=strlen(&ret[idx]);
done=1;
- }
+ }
break;
case 'p': /* primary pk fingerprint of a sk */
@@ -678,7 +693,7 @@ pct_expando(const char *string,struct expando_args *args)
case 't': /* e.g. "jpg" */
str=image_type_to_string(args->imagetype,0);
break;
-
+
case 'T': /* e.g. "image/jpeg" */
str=image_type_to_string(args->imagetype,2);
break;
@@ -777,7 +792,7 @@ deprecated_command (const char *name)
void
-obsolete_option (const char *configname, unsigned int configlineno,
+obsolete_option (const char *configname, unsigned int configlineno,
const char *name)
{
if(configname)
@@ -793,9 +808,9 @@ obsolete_option (const char *configname, unsigned int configlineno,
* Wrapper around gcry_cipher_map_name to provide a fallback using the
* "Sn" syntax as used by the preference strings.
*/
-int
-string_to_cipher_algo (const char *string)
-{
+int
+string_to_cipher_algo (const char *string)
+{
int val;
val = map_cipher_gcry_to_openpgp (gcry_cipher_map_name (string));
@@ -816,9 +831,9 @@ string_to_cipher_algo (const char *string)
* Wrapper around gcry_md_map_name to provide a fallback using the
* "Hn" syntax as used by the preference strings.
*/
-int
-string_to_digest_algo (const char *string)
-{
+int
+string_to_digest_algo (const char *string)
+{
int val;
val = gcry_md_map_name (string);
@@ -1223,7 +1238,7 @@ has_invalid_email_chars (const char *s)
const char *valid_chars=
"01234567890_-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
- for ( ; *s; s++ )
+ for ( ; *s; s++ )
{
if ( (*s & 0x80) )
continue; /* We only care about ASCII. */
@@ -1344,7 +1359,7 @@ int
pubkey_get_nenc( int algo )
{
size_t n;
-
+
if (algo == GCRY_PK_ELG_E)
algo = GCRY_PK_ELG;
if (gcry_pk_algo_info( algo, GCRYCTL_GET_ALGO_NENCR, NULL, &n ))
-----------------------------------------------------------------------
Summary of changes:
g10/keyserver.c | 41 ++++++++++++++-------------
g10/main.h | 5 ++-
g10/misc.c | 81 ++++++++++++++++++++++++++++++++----------------------
3 files changed, 72 insertions(+), 55 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list