From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 3 Nov 2002 11:30:51 +0000 (+0000)
Subject: Renamed GNUTLS_E_X509_KEY_USAGE_VIOLATION to GNUTLS_E_KEY_USAGE_VIOLATION,
X-Git-Tag: gnutls_0_5_11~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61b4620300fd3945588b3c17e4fff46aef697f72;p=thirdparty%2Fgnutls.git

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 b6ea1fd20e..709f843e7e 100644
--- 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 5f52d461dc..42914a7226 100644
--- 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 920f4624f5..56ce93a6cc 100644
--- 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 2de2697dd0..e718cbfb3f 100644
--- 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;