commit 85dfe08b31275aca89e886369285d8d2e18a3c2d
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Sep 10 15:59:02 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Thu Sep 12 11:57:00 2013 +0200
tree 2cbd1b6cf89695516b08fe5cfb9bdbb9f54b6276
parent da7317ed00d52124036728f7cb9f2a33c6b76959

Merge duplicated else/#else branch

library/x509parse.c

diff --git a/library/x509parse.c b/library/x509parse.c
index 2290b7b..fc84e61 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -1697,6 +1697,7 @@
         return( ret );
     }
     else
+#endif
     {
         /*
          * nope, copy the raw DER data
@@ -1710,16 +1711,6 @@
 
         buflen = 0;
     }
-#else
-    p = (unsigned char *) polarssl_malloc( len = buflen );
-
-    if( p == NULL )
-        return( POLARSSL_ERR_X509_MALLOC_FAILED );
-
-    memcpy( p, buf, buflen );
-
-    buflen = 0;
-#endif
 
     csr->raw.p = p;
     csr->raw.len = len;
@@ -1926,6 +1917,7 @@
         return( ret );
     }
     else
+#endif
     {
         /*
          * nope, copy the raw DER data
@@ -1939,16 +1931,6 @@
 
         buflen = 0;
     }
-#else
-    p = (unsigned char *) polarssl_malloc( len = buflen );
-
-    if( p == NULL )
-        return( POLARSSL_ERR_X509_MALLOC_FAILED );
-
-    memcpy( p, buf, buflen );
-
-    buflen = 0;
-#endif
 
     crl->raw.p = p;
     crl->raw.len = len;