Renamed GNUTLS_E_X509_KEY_USAGE_VIOLATION to GNUTLS_E_KEY_USAGE_VIOLATION,

in order to apply to PGP keys as well.

diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index b6ea1fd20ec1caa76f90cd5ff6d3ef0aa08a5e59..709f843e7e7fd9707ea3245d42abd0725a36d79d 100644 (file)
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -91,7 +91,7 @@ static gnutls_error_entry error_algorithms[] = {
        ERROR_ENTRY("Unknown Subject Alternative name in X.509 certificate.", GNUTLS_E_X509_UNKNOWN_SAN, 1 ), 
 
        ERROR_ENTRY("Unsupported critical extension in X.509 certificate.", GNUTLS_E_X509_UNSUPPORTED_CRITICAL_EXTENSION, 1 ), 
-       ERROR_ENTRY("Key usage violation in X.509 certificate, has been detected.", GNUTLS_E_X509_KEY_USAGE_VIOLATION, 1 ), 
+       ERROR_ENTRY("Key usage violation in certificate, has been detected.", GNUTLS_E_KEY_USAGE_VIOLATION, 1 ), 
        ERROR_ENTRY("Function was interrupted.", GNUTLS_E_AGAIN, 0 ), 
        ERROR_ENTRY("Function was interrupted.", GNUTLS_E_INTERRUPTED, 0 ), 
        ERROR_ENTRY("Rehandshake was requested by the peer.", GNUTLS_E_REHANDSHAKE, 0 ),

diff --git a/lib/gnutls_errors_int.h b/lib/gnutls_errors_int.h
index 5f52d461dcdc20061da395ff76bd3264be858ba0..42914a7226138272db2d30a7b97c30b2893ff740 100644 (file)
--- a/lib/gnutls_errors_int.h
+++ b/lib/gnutls_errors_int.h
@@ -40,7 +40,7 @@
 #define GNUTLS_E_PK_DECRYPTION_FAILED -45
 #define GNUTLS_E_PK_SIGN_FAILED -46
 #define GNUTLS_E_X509_UNSUPPORTED_CRITICAL_EXTENSION -47
-#define GNUTLS_E_X509_KEY_USAGE_VIOLATION -48
+#define GNUTLS_E_KEY_USAGE_VIOLATION -48
 #define GNUTLS_E_NO_CERTIFICATE_FOUND -49 /* GNUTLS_A_BAD_CERTIFICATE */
 #define GNUTLS_E_INVALID_REQUEST -50
 #define GNUTLS_E_SHORT_MEMORY_BUFFER -51

diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index 920f4624f5e0327affccef42126f1e5358537273..56ce93a6ccf073b46eddb4c42a9f68395cdf760e 100644 (file)
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -161,7 +161,7 @@ gnutls_datum tmpdata;
           if ( cert->keyUsage != 0)
                if ( !(cert->keyUsage & GNUTLS_X509KEY_DIGITAL_SIGNATURE)) {
                        gnutls_assert();
-                       return GNUTLS_E_X509_KEY_USAGE_VIOLATION;
+                       return GNUTLS_E_KEY_USAGE_VIOLATION;
                }
 
        tmpdata.data = hash_concat->data;
@@ -215,7 +215,7 @@ int _gnutls_pkcs1_rsa_verify_sig( gnutls_cert *cert, const gnutls_datum *hash_co
           if ( cert->keyUsage != 0)
                if ( !(cert->keyUsage & GNUTLS_X509KEY_DIGITAL_SIGNATURE)) {
                        gnutls_assert();
-                       return GNUTLS_E_X509_KEY_USAGE_VIOLATION;
+                       return GNUTLS_E_KEY_USAGE_VIOLATION;
                }
 
        switch(cert->subject_pk_algorithm) {

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 2de2697dd0e08adfc4dfbf6b984f98e557397e08..e718cbfb3f196708a079edb5a0c116a37e36c7f5 100644 (file)
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -2222,7 +2222,7 @@ int _gnutls_check_x509_key_usage(const gnutls_cert * cert,
                                    (cert->
                                     keyUsage & GNUTLS_X509KEY_KEY_ENCIPHERMENT))
                                        return
-                                           GNUTLS_E_X509_KEY_USAGE_VIOLATION;
+                                           GNUTLS_E_KEY_USAGE_VIOLATION;
                                else
                                        return 0;
                        }
@@ -2235,14 +2235,14 @@ int _gnutls_check_x509_key_usage(const gnutls_cert * cert,
                                    (cert->
                                     keyUsage & GNUTLS_X509KEY_DIGITAL_SIGNATURE))
                                        return
-                                           GNUTLS_E_X509_KEY_USAGE_VIOLATION;
+                                           GNUTLS_E_KEY_USAGE_VIOLATION;
                                else
                                        return 0;
                        }
                        return 0;
                default:
                        gnutls_assert();
-                       return GNUTLS_E_X509_KEY_USAGE_VIOLATION;
+                       return GNUTLS_E_INTERNAL_ERROR;
                }
        }
        return 0;