Corrected a bug in the GNUTLS_KEY key usage definitions.

diff --git a/NEWS b/NEWS
index c8761c58e41fd5b232d47a8e1a24d305f61e07ca..7272ea54dd711aef65305b5e999d3f3259c4ba17 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 Version 1.0.3
 - Corrected bug in gnutls_bye() which made it return an error code
   of INVALID_REQUEST instead of success.
+- Corrected a bug in the GNUTLS_KEY key usage definitions.
 
 Version 1.0.2 (18/12/2003)
 - Corrected a bug in the RSA key generation. This was

diff --git a/includes/gnutls/x509.h b/includes/gnutls/x509.h
index 143c67abd502dfc9df58389af5219f322747b902..a59fd5ff1b98a8db851491a9fdccbfa54e299656 100644 (file)
--- a/includes/gnutls/x509.h
+++ b/includes/gnutls/x509.h
@@ -91,15 +91,19 @@ int gnutls_x509_dn_oid_known(const char* oid);
 
 /* key_usage will be an OR of the following values:
  */
-#define GNUTLS_KEY_DIGITAL_SIGNATURE           256
-#define GNUTLS_KEY_NON_REPUDIATION             128
-#define GNUTLS_KEY_KEY_ENCIPHERMENT            64
-#define GNUTLS_KEY_DATA_ENCIPHERMENT           32
-#define GNUTLS_KEY_KEY_AGREEMENT               16
-#define GNUTLS_KEY_KEY_CERT_SIGN               8
-#define GNUTLS_KEY_CRL_SIGN                    4
-#define GNUTLS_KEY_ENCIPHER_ONLY               2
-#define GNUTLS_KEY_DECIPHER_ONLY               1
+#define GNUTLS_KEY_DIGITAL_SIGNATURE           128 /* when the key is to be
+                                                    * used for signing.
+                                                    */
+#define GNUTLS_KEY_NON_REPUDIATION             64
+#define GNUTLS_KEY_KEY_ENCIPHERMENT            32 /* when the key is to be 
+                                                   * used for encryption.
+                                                   */
+#define GNUTLS_KEY_DATA_ENCIPHERMENT           16
+#define GNUTLS_KEY_KEY_AGREEMENT               8
+#define GNUTLS_KEY_KEY_CERT_SIGN               4
+#define GNUTLS_KEY_CRL_SIGN                    2
+#define GNUTLS_KEY_ENCIPHER_ONLY               1
+#define GNUTLS_KEY_DECIPHER_ONLY               256
 
 int gnutls_x509_crt_get_extension_oid(gnutls_x509_crt cert, int indx, 
        void* oid, size_t * sizeof_oid);

diff --git a/lib/gnutls_cert.h b/lib/gnutls_cert.h
index f12bc96274e041162c9f726672306fd2f5bbe843..a809a9fdfd49157265a8a63e757dbf59df89316c 100644 (file)
--- a/lib/gnutls_cert.h
+++ b/lib/gnutls_cert.h
@@ -15,15 +15,15 @@
 /* For key Usage, test as:
  * if (st.keyUsage & KEY_DIGITAL_SIGNATURE) ...
  */
-#define KEY_DIGITAL_SIGNATURE          256
-#define KEY_NON_REPUDIATION            128
-#define KEY_KEY_ENCIPHERMENT           64
-#define KEY_DATA_ENCIPHERMENT          32
-#define KEY_KEY_AGREEMENT              16
-#define KEY_KEY_CERT_SIGN              8
-#define KEY_CRL_SIGN                   4
-#define KEY_ENCIPHER_ONLY              2
-#define KEY_DECIPHER_ONLY              1
+#define KEY_DIGITAL_SIGNATURE          128
+#define KEY_NON_REPUDIATION            64
+#define KEY_KEY_ENCIPHERMENT           32
+#define KEY_DATA_ENCIPHERMENT          16
+#define KEY_KEY_AGREEMENT              8
+#define KEY_KEY_CERT_SIGN              4
+#define KEY_CRL_SIGN                   2
+#define KEY_ENCIPHER_ONLY              1
+#define KEY_DECIPHER_ONLY              256
 
 typedef struct gnutls_cert {
        GNUTLS_MPI params[MAX_PUBLIC_PARAMS_SIZE];      /* the size of params depends on the public