diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-10-31 17:24:43 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-10-31 17:24:43 +0000 |
| commit | ee798a0c9299a98d1cb1376a6d8c46a86c131d4a (patch) | |
| tree | a80d0fb5a08396b1748097089c18558099d2610e | |
| parent | bf62e33c481211c69a60f3e3deb1ab796b72ca19 (diff) | |
| download | gnutls-ee798a0c9299a98d1cb1376a6d8c46a86c131d4a.tar.gz | |
*** empty log message ***
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | lib/gnutls_errors.c | 2 | ||||
| -rw-r--r-- | lib/gnutls_errors_int.h | 2 | ||||
| -rw-r--r-- | libextra/gnutls_openpgp.c | 1 | ||||
| -rw-r--r-- | libextra/openpgp/extras.c | 4 |
5 files changed, 7 insertions, 3 deletions
@@ -2,6 +2,7 @@ Version 0.9.95 - Improved the verification functions. Added the GNUTLS_CERT_ISSUER_NOT_CA, GNUTLS_CERT_ISSUER_NOT_FOUND verification output flags, and removed the unused GNUTLS_CERT_CORRUPTED. +- Improved the OpenPGP key support. Version 0.9.94 (30/10/2003) - Added manpages for the included programs. diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c index 9a59bf7fdf..eebfa4e20e 100644 --- a/lib/gnutls_errors.c +++ b/lib/gnutls_errors.c @@ -130,6 +130,8 @@ static gnutls_error_entry error_algorithms[] = { GNUTLS_E_INCOMPATIBLE_LIBTASN1_LIBRARY, 1 ), ERROR_ENTRY("The specified GnuPG TrustDB version is not supported. TrustDB v4 is supported.", GNUTLS_E_OPENPGP_TRUSTDB_VERSION_UNSUPPORTED, 1 ), + + ERROR_ENTRY("Error loading the keyring.", GNUTLS_E_OPENPGP_KEYRING_ERROR, 1 ), ERROR_ENTRY("The initialization of LZO has failed.", GNUTLS_E_LZO_INIT_FAILED, 1 ), ERROR_ENTRY("No supported compression algorithms have been found.", GNUTLS_E_NO_COMPRESSION_ALGORITHMS, 1 ), ERROR_ENTRY("No supported cipher suites have been found.", GNUTLS_E_NO_CIPHER_SUITES, 1 ), diff --git a/lib/gnutls_errors_int.h b/lib/gnutls_errors_int.h index 0642bc064c..9c680ebe69 100644 --- a/lib/gnutls_errors_int.h +++ b/lib/gnutls_errors_int.h @@ -121,6 +121,8 @@ #define GNUTLS_E_INCOMPATIBLE_GCRYPT_LIBRARY -202 #define GNUTLS_E_INCOMPATIBLE_LIBTASN1_LIBRARY -203 +#define GNUTLS_E_OPENPGP_KEYRING_ERROR -204 + #define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250 /* _INT_ internal errors. Not exported */ diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c index 016200ef7c..3eda430545 100644 --- a/libextra/gnutls_openpgp.c +++ b/libextra/gnutls_openpgp.c @@ -568,7 +568,6 @@ gnutls_certificate_set_openpgp_key_mem( gnutls_certificate_credentials res, i = 1; rc = cdk_keydb_get_keyblock( inp, &knode ); -#warning FIX THIS while( knode && (p = cdk_kbnode_walk( knode, &ctx, 0 )) ) { pkt = cdk_kbnode_get_packet( p ); diff --git a/libextra/openpgp/extras.c b/libextra/openpgp/extras.c index 42982b49c4..e6ddeb317e 100644 --- a/libextra/openpgp/extras.c +++ b/libextra/openpgp/extras.c @@ -97,13 +97,13 @@ keybox_blob *blob = NULL; blob = kbx_read_blob( data, 0); if( !blob ) { gnutls_assert(); - return GNUTLS_E_INTERNAL_ERROR; + return GNUTLS_E_OPENPGP_KEYRING_ERROR; } keyring->hd = kbx_to_keydb( blob); if( !keyring->hd ) { gnutls_assert(); - rc = GNUTLS_E_INTERNAL_ERROR; + rc = GNUTLS_E_OPENPGP_KEYRING_ERROR; goto leave; } |