diff options
| author | Nikos <nmav@crystal.(none)> | 2008-02-18 21:46:28 +0200 |
|---|---|---|
| committer | Nikos <nmav@crystal.(none)> | 2008-02-18 21:46:28 +0200 |
| commit | 26f09c012128dbb17b50ed60f79e32d50328d783 (patch) | |
| tree | 22332396e7829b1df7b79d1964123d620333e231 /src | |
| parent | ee0eb5b70c4e4db7a266a0915b520df335fad069 (diff) | |
| download | gnutls-26f09c012128dbb17b50ed60f79e32d50328d783.tar.gz | |
pgp_keyid_t is now compatible with the 2.2 key id.
Diffstat (limited to 'src')
| -rw-r--r-- | src/certtool.c | 6 | ||||
| -rw-r--r-- | src/cli-gaa.c | 2 | ||||
| -rw-r--r-- | src/cli.c | 4 | ||||
| -rw-r--r-- | src/serv-gaa.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/certtool.c b/src/certtool.c index f2d58b93c8..b1253b0be6 100644 --- a/src/certtool.c +++ b/src/certtool.c @@ -1177,9 +1177,9 @@ pgp_privkey_info (void) size = sizeof (buffer); if (i == -1) - ret = gnutls_openpgp_privkey_get_key_id (key, &keyid); + ret = gnutls_openpgp_privkey_get_key_id (key, keyid); else - ret = gnutls_openpgp_privkey_get_subkey_id (key, i, &keyid); + ret = gnutls_openpgp_privkey_get_subkey_id (key, i, keyid); if (ret < 0) { @@ -1189,7 +1189,7 @@ pgp_privkey_info (void) else { fprintf (outfile, "Public Key ID: %s\n", - raw_to_string (keyid.keyid, 8)); + raw_to_string (keyid, 8)); } } diff --git a/src/cli-gaa.c b/src/cli-gaa.c index 3834f79bc1..46b9c32e2a 100644 --- a/src/cli-gaa.c +++ b/src/cli-gaa.c @@ -149,7 +149,7 @@ void gaa_help(void) __gaa_helpsingle(0, "pgpkeyfile", "FILE ", "PGP Key file to use."); __gaa_helpsingle(0, "pgpkeyring", "FILE ", "PGP Key ring file to use."); __gaa_helpsingle(0, "pgpcertfile", "FILE ", "PGP Public Key (certificate) file to use."); - __gaa_helpsingle(0, "pgpsubkey", "HEX ", "PGP subkey to use."); + __gaa_helpsingle(0, "pgpsubkey", "HEX|auto ", "PGP subkey to use."); __gaa_helpsingle(0, "x509keyfile", "FILE ", "X.509 key file to use."); __gaa_helpsingle(0, "x509certfile", "FILE ", "X.509 Certificate file to use."); __gaa_helpsingle(0, "srpusername", "NAME ", "SRP username to use."); @@ -170,7 +170,7 @@ static gnutls_openpgp_privkey_t pgp_key = NULL; static void get_keyid( gnutls_openpgp_keyid_t* keyid, const char* str) { - size_t keyid_size = sizeof(keyid->keyid); + size_t keyid_size = sizeof(keyid); if (strlen(str) != 16) { @@ -178,7 +178,7 @@ static void get_keyid( gnutls_openpgp_keyid_t* keyid, const char* str) exit(1); } - if (gnutls_hex2bin (str, strlen(str), keyid->keyid, &keyid_size) < 0) + if (gnutls_hex2bin (str, strlen(str), keyid, &keyid_size) < 0) { fprintf(stderr, "Error converting hex string: %s.\n", str); exit(1); diff --git a/src/serv-gaa.c b/src/serv-gaa.c index a31c31eddc..c2c4f13388 100644 --- a/src/serv-gaa.c +++ b/src/serv-gaa.c @@ -139,7 +139,7 @@ void gaa_help(void) __gaa_helpsingle(0, "pgpkeyring", "FILE ", "PGP Key ring file to use."); __gaa_helpsingle(0, "pgpkeyfile", "FILE ", "PGP Key file to use."); __gaa_helpsingle(0, "pgpcertfile", "FILE ", "PGP Public Key (certificate) file to use."); - __gaa_helpsingle(0, "pgpsubkey", "HEX ", "PGP subkey to use."); + __gaa_helpsingle(0, "pgpsubkey", "HEX|auto ", "PGP subkey to use."); __gaa_helpsingle(0, "x509keyfile", "FILE ", "X.509 key file to use."); __gaa_helpsingle(0, "x509certfile", "FILE ", "X.509 Certificate file to use."); __gaa_helpsingle(0, "x509dsakeyfile", "FILE ", "Alternative X.509 key file to use."); |