From 767da41b168b20812dd1f9c6f069c261a327e086 Mon Sep 17 00:00:00 2001 From: Chris Conlon Date: Mon, 30 Nov 2015 14:18:17 -0700 Subject: [PATCH] allow 1024 and 2048 example cert buffers to be enabled at same time, gencertbuf.pl --- gencertbuf.pl | 7 ++++--- wolfssl/certs_test.h | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gencertbuf.pl b/gencertbuf.pl index 9a11a7147..450ff764a 100755 --- a/gencertbuf.pl +++ b/gencertbuf.pl @@ -71,9 +71,10 @@ for (my $i = 0; $i < $num_1024; $i++) { print OUT_FILE "};\n"; print OUT_FILE "static const int sizeof_$sname = sizeof($sname);\n\n"; } +print OUT_FILE "#endif /* USE_CERT_BUFFERS_1024 */\n\n"; # convert and print 2048-bit certs/keys -print OUT_FILE "#elif defined(USE_CERT_BUFFERS_2048)\n\n"; +print OUT_FILE "#ifdef USE_CERT_BUFFERS_2048\n\n"; for (my $i = 0; $i < $num_2048; $i++) { my $fname = $fileList_2048[$i][0]; @@ -87,7 +88,7 @@ for (my $i = 0; $i < $num_2048; $i++) { print OUT_FILE "static const int sizeof_$sname = sizeof($sname);\n\n"; } -print OUT_FILE "#endif /* USE_CERT_BUFFERS_1024 */\n\n"; +print OUT_FILE "#endif /* USE_CERT_BUFFERS_2048 */\n\n"; print OUT_FILE "/* dh1024 p */ static const unsigned char dh_p[] = { @@ -108,7 +109,7 @@ static const unsigned char dh_p[] = static const unsigned char dh_g[] = { 0x02, -};\n\n\n"; +};\n\n"; print OUT_FILE "#endif /* WOLFSSL_CERTS_TEST_H */\n\n"; # close certs_test.h file diff --git a/wolfssl/certs_test.h b/wolfssl/certs_test.h index e7ab3c767..6a3fb4799 100644 --- a/wolfssl/certs_test.h +++ b/wolfssl/certs_test.h @@ -606,7 +606,9 @@ static const unsigned char server_cert_der_1024[] = }; static const int sizeof_server_cert_der_1024 = sizeof(server_cert_der_1024); -#elif defined(USE_CERT_BUFFERS_2048) +#endif /* USE_CERT_BUFFERS_1024 */ + +#ifdef USE_CERT_BUFFERS_2048 /* ./certs/client-key.der, 2048-bit */ static const unsigned char client_key_der_2048[] = @@ -1526,7 +1528,7 @@ static const unsigned char server_cert_der_2048[] = }; static const int sizeof_server_cert_der_2048 = sizeof(server_cert_der_2048); -#endif /* USE_CERT_BUFFERS_1024 */ +#endif /* USE_CERT_BUFFERS_2048 */ /* dh1024 p */ static const unsigned char dh_p[] = @@ -1550,6 +1552,5 @@ static const unsigned char dh_g[] = 0x02, }; - #endif /* WOLFSSL_CERTS_TEST_H */