commit d30cd34dc26f220b622b25d1835f325857f14cbb
author Hanno Becker <hanno.becker@arm.com> Fri Oct 12 10:46:32 2018 +0100
committer Hanno Becker <hanno.becker@arm.com> Tue Oct 16 13:53:50 2018 +0100
tree 45da94c700f5fc5fcaf8fd317648717e455553b6
parent 30617b080a5530742a7e99e484bba8c6c9e37b55

Make PBE-related parts of PKCS12 depend on MBEDTLS_ASN1_PARSE_C

library/pkcs12.c

diff --git a/library/pkcs12.c b/library/pkcs12.c
index c603a13..5e8b287 100644
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@@ -52,6 +52,8 @@
     volatile unsigned char *p = v; while( n-- ) *p++ = 0;
 }
 
+#if defined(MBEDTLS_ASN1_PARSE_C)
+
 static int pkcs12_parse_pbe_params( mbedtls_asn1_buf *params,
                                     mbedtls_asn1_buf *salt, int *iterations )
 {
@@ -230,6 +232,8 @@
     return( ret );
 }
 
+#endif /* MBEDTLS_ASN1_PARSE_C */
+
 static void pkcs12_fill_buffer( unsigned char *data, size_t data_len,
                                 const unsigned char *filler, size_t fill_len )
 {