commit f4cf80b86f998260028494443af3cd74e44f933a
author Paul Bakker <p.j.bakker@polarssl.org> Thu Apr 17 17:19:56 2014 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Thu Apr 17 17:24:29 2014 +0200
tree c06a7fb9bf25ba6857de05317b331dd370f2e3b9
parent 03b6a46353708859482469a80da30a6e428134a7

Restructured pk_parse_key_pkcs8_encrypted_der() to prevent unreachable code

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 391deb3..d0ae5d5 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -921,7 +921,7 @@
                                     const unsigned char *key, size_t keylen,
                                     const unsigned char *pwd, size_t pwdlen )
 {
-    int ret;
+    int ret, decrypted = 0;
     size_t len;
     unsigned char buf[2048];
     unsigned char *p, *end;
@@ -985,6 +985,8 @@
 
             return( ret );
         }
+
+        decrypted = 1;
     }
     else if( OID_CMP( OID_PKCS12_PBE_SHA1_RC4_128, &pbe_alg_oid ) )
     {
@@ -1001,6 +1003,8 @@
         //
         if( *buf != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) )
             return( POLARSSL_ERR_PK_PASSWORD_MISMATCH );
+
+        decrypted = 1;
     }
     else
 #endif /* POLARSSL_PKCS12_C */
@@ -1015,14 +1019,18 @@
 
             return( ret );
         }
+
+        decrypted = 1;
     }
     else
 #endif /* POLARSSL_PKCS5_C */
     {
         ((void) pwd);
-        return( POLARSSL_ERR_PK_FEATURE_UNAVAILABLE );
     }
 
+    if( decrypted == 0 )
+        return( POLARSSL_ERR_PK_FEATURE_UNAVAILABLE );
+
     return( pk_parse_key_pkcs8_unencrypted_der( pk, buf, len ) );
 }