commit 9a702255f4f5cbbd742afc956813d96cb45ea750
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Jun 23 10:14:36 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Jun 23 13:09:10 2015 +0200
tree 7fa6850391772d3997d255d227a73bd04f9fdcc2
parent b80d16d171ecca3de8c71789f4a5075a946af6a0

Add parsing/printing for new X.509 keyUsage flags

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index 4fddf65..2285e1d 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -371,6 +371,7 @@
                                unsigned int *key_usage)
 {
     int ret;
+    size_t i;
     mbedtls_x509_bitstring bs = { 0, 0, NULL };
 
     if( ( ret = mbedtls_asn1_get_bitstring( p, end, &bs ) ) != 0 )
@@ -381,7 +382,12 @@
                 MBEDTLS_ERR_ASN1_INVALID_LENGTH );
 
     /* Get actual bitstring */
-    *key_usage = *bs.p;
+    *key_usage = 0;
+    for( i = 0; i < bs.len && i < sizeof( unsigned int ); i++ )
+    {
+        *key_usage |= (unsigned int) bs.p[i] << (8*i);
+    }
+
     return( 0 );
 }
 
@@ -1274,7 +1280,7 @@
         PRINT_ITEM( name );
 
 static int x509_info_key_usage( char **buf, size_t *size,
-                                unsigned char key_usage )
+                                unsigned int key_usage )
 {
     int ret;
     size_t n = *size;
@@ -1288,6 +1294,8 @@
     KEY_USAGE( MBEDTLS_X509_KU_KEY_AGREEMENT,        "Key Agreement" );
     KEY_USAGE( MBEDTLS_X509_KU_KEY_CERT_SIGN,        "Key Cert Sign" );
     KEY_USAGE( MBEDTLS_X509_KU_CRL_SIGN,             "CRL Sign" );
+    KEY_USAGE( MBEDTLS_X509_KU_ENCIPHER_ONLY,        "Encipher Only" );
+    KEY_USAGE( MBEDTLS_X509_KU_DECIPHER_ONLY,        "Decipher Only" );
 
     *size = n;
     *buf = p;