Add OpenPGP error description

diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index 709f843e7e7fd9707ea3245d42abd0725a36d79d..88829cb44dc48522b41df90c5d586c0dc83736ed 100644 (file)
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -124,7 +124,8 @@ static gnutls_error_entry error_algorithms[] = {
                GNUTLS_E_OPENPGP_TRUSTDB_VERSION_UNSUPPORTED, 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 ), 
+       ERROR_ENTRY("No supported cipher suites have been found.", GNUTLS_E_NO_CIPHER_SUITES, 1 ),
+        ERROR_ENTRY("Could not get OpenPGP key", GNUTLS_E_OPENPGP_GETKEY_FAILED, 1),
        {0}
 };
 

diff --git a/lib/gnutls_errors_int.h b/lib/gnutls_errors_int.h
index 42914a7226138272db2d30a7b97c30b2893ff740..7fd81c0b1f4a7655bf9756f37b7c674f8628e92c 100644 (file)
--- a/lib/gnutls_errors_int.h
+++ b/lib/gnutls_errors_int.h
@@ -73,7 +73,7 @@
 #define GNUTLS_E_OPENPGP_UID_REVOKED -79
 #define GNUTLS_E_UNKNOWN_PK_ALGORITHM -80
 #define GNUTLS_E_OPENPGP_TRUSTDB_VERSION_UNSUPPORTED -81
-#define GNUTLS_E_GETKEY_FAILED -88
+#define GNUTLS_E_OPENPGP_GETKEY_FAILED -88
 
 /* returned if libextra functionality was requested but
  * gnutls_global_init_extra() was not called.

diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c
index 5cfc936e1cf8ae17a0440ceb5c6b99ec19d8e2f0..9a1ffc646d1206b2d4567e240d37116ac673dee1 100644 (file)
--- a/libextra/gnutls_openpgp.c
+++ b/libextra/gnutls_openpgp.c
@@ -77,7 +77,7 @@ map_cdk_rc( int rc )
     case CDK_General_Error: return GNUTLS_E_INTERNAL_ERROR;
     case CDK_File_Error: return GNUTLS_E_FILE_ERROR;
     case CDK_MPI_Error: return GNUTLS_E_MPI_SCAN_FAILED;
-    case CDK_Error_No_Key: return GNUTLS_E_GETKEY_FAILED;
+    case CDK_Error_No_Key: return GNUTLS_E_OPENPGP_GETKEY_FAILED;
     case CDK_Wrong_Format: return GNUTLS_E_OPENPGP_TRUSTDB_VERSION_UNSUPPORTED;
     case CDK_Armor_Error: return GNUTLS_E_ASCII_ARMOR_ERROR;
     case CDK_Inv_Value: return GNUTLS_E_INVALID_REQUEST;