add sizeof ints back to certs_test.h, fix cert buffer usage in benchmark.c

ctaocrypt/benchmark/benchmark.c

@@ -785,15 +785,14 @@ static RNG rng;
 #ifndef NO_RSA
 
 
-#if !defined(USE_CERT_BUFFERS_1024) && !defined(USE_CERT_BUFFERS_2048) && \
-                                                    defined(CYASSL_MDK_SHELL)
-static char *certRSAname = "certs/rsa2048.der" ;
-static void set_Bench_RSA_File(char * cert) { certRSAname = cert ; }   
-                                                 /* set by shell command */
-#elif defined(CYASSL_MDK_SHELL)
-    /* nothing */
-#else
-static const char *certRSAname = "certs/rsa2048.der" ;
+#if !defined(USE_CERT_BUFFERS_1024) && !defined(USE_CERT_BUFFERS_2048)
+    #if defined(CYASSL_MDK_SHELL)
+        static char *certRSAname = "certs/rsa2048.der";
+        /* set by shell command */
+        static void set_Bench_RSA_File(char * cert) { certRSAname = cert ; }
+    #else
+        static const char *certRSAname = "certs/rsa2048.der";
+    #endif
 #endif
 
 void bench_rsa(void)
@@ -890,15 +889,14 @@ void bench_rsa(void)
 #ifndef NO_DH
 
 
-#if !defined(USE_CERT_BUFFERS_1024) && !defined(USE_CERT_BUFFERS_2048) && \
-                                                    defined(CYASSL_MDK_SHELL)
-static char *certDHname = "certs/dh2048.der" ;
-void set_Bench_DH_File(char * cert) { certDHname = cert ; }    
-                                            /* set by shell command */
-#elif defined(CYASSL_MDK_SHELL)
-    /* nothing */
-#else
-static const char *certDHname = "certs/dh2048.der" ;
+#if !defined(USE_CERT_BUFFERS_1024) && !defined(USE_CERT_BUFFERS_2048)
+    #if defined(CYASSL_MDK_SHELL)
+        static char *certDHname = "certs/dh2048.der";
+        /* set by shell command */
+        void set_Bench_DH_File(char * cert) { certDHname = cert ; }
+    #else
+        static const char *certDHname = "certs/dh2048.der";
+    #endif
 #endif
 
 void bench_dh(void)

cyassl/certs_test.h

@@ -70,6 +70,7 @@ const unsigned char client_key_der_1024[] =
 	0xA2, 0xFE, 0xBF, 0x08, 0x6B, 0x1A, 0x5D, 0x3F, 0x90, 0x12, 
 	0xB1, 0x05, 0x86, 0x31, 0x29, 0xDB, 0xD9, 0xE2
 };
+const int sizeof_client_key_der_1024 = sizeof(client_key_der_1024);
 
 /* ./certs/1024/client-cert.der, 1024-bit */
 const unsigned char client_cert_der_1024[] =
@@ -151,6 +152,7 @@ const unsigned char client_cert_der_1024[] =
 	0x1B, 0x4E, 0x5D, 0xBC, 0x4E, 0x9A, 0x7C, 0x1F, 0xAB, 0x56, 
 	0x47, 0x4A
 };
+const int sizeof_client_cert_der_1024 = sizeof(client_cert_der_1024);
 
 /* ./certs/1024/dh1024.der, 1024-bit */
 const unsigned char dh_key_der_1024[] =
@@ -170,6 +172,7 @@ const unsigned char dh_key_der_1024[] =
 	0x8C, 0x63, 0x0A, 0xAD, 0xC7, 0x10, 0xEA, 0xC7, 0xA1, 0xB9, 
 	0x9D, 0xF2, 0xA8, 0x37, 0x73, 0x02, 0x01, 0x02
 };
+const int sizeof_dh_key_der_1024 = sizeof(dh_key_der_1024);
 
 /* ./certs/1024/dsa1024.der, 1024-bit */
 const unsigned char dsa_key_der_1024[] =
@@ -220,6 +223,7 @@ const unsigned char dsa_key_der_1024[] =
 	0x3B, 0xA1, 0x19, 0x75, 0xDF, 0x9B, 0xF5, 0x72, 0x53, 0x4F, 
 	0x39, 0xE1, 0x1C, 0xEC, 0x13, 0x84, 0x82, 0x18
 };
+const int sizeof_dsa_key_der_1024 = sizeof(dsa_key_der_1024);
 
 /* ./certs/1024/rsa1024.der, 1024-bit */
 const unsigned char rsa_key_der_1024[] =
@@ -286,6 +290,7 @@ const unsigned char rsa_key_der_1024[] =
 	0xB9, 0x9E, 0xD5, 0x5B, 0x2E, 0x87, 0x1C, 0x58, 0xD0, 0x37, 
 	0x89, 0x96, 0xEC, 0x48, 0x54, 0xF5, 0x9F, 0x0F, 0xB3
 };
+const int sizeof_rsa_key_der_1024 = sizeof(rsa_key_der_1024);
 
 #elif defined(USE_CERT_BUFFERS_2048)
 
@@ -413,6 +418,7 @@ const unsigned char client_key_der_2048[] =
 	0x45, 0x5D, 0x13, 0x39, 0x65, 0x42, 0x46, 0xA1, 0x9F, 0xCD, 
 	0xF5, 0xBF
 };
+const int sizeof_client_key_der_2048 = sizeof(client_key_der_2048);
 
 /* ./certs/client-cert.der, 2048-bit */
 const unsigned char client_cert_der_2048[] =
@@ -537,6 +543,7 @@ const unsigned char client_cert_der_2048[] =
 	0xC9, 0xB1, 0x71, 0x7E, 0x1B, 0x2B, 0xE1, 0xE3, 0xAF, 0xC0
 
 };
+const int sizeof_client_cert_der_2048 = sizeof(client_cert_der_2048);
 
 /* ./certs/dh2048.der, 2048-bit */
 const unsigned char dh_key_der_2048[] =
@@ -569,6 +576,7 @@ const unsigned char dh_key_der_2048[] =
 	0xC3, 0xA9, 0x41, 0x83, 0xFB, 0xC7, 0xFA, 0xC8, 0xE2, 0x1E, 
 	0x7E, 0xAF, 0x00, 0x3F, 0x93, 0x02, 0x01, 0x02
 };
+const int sizeof_dh_key_der_2048 = sizeof(dh_key_der_2048);
 
 /* ./certs/dsa2048.der, 2048-bit */
 const unsigned char dsa_key_der_2048[] =
@@ -658,6 +666,7 @@ const unsigned char dsa_key_der_2048[] =
 	0x3E, 0x75, 0x13, 0x13, 0x06, 0x8F, 0x94, 0xD3, 0xE6, 0xE9, 
 	0x00, 0xCB, 0x62, 0x6D, 0x9A
 };
+const int sizeof_dsa_key_der_2048 = sizeof(dsa_key_der_2048);
 
 /* ./certs/rsa2048.der, 2048-bit */
 const unsigned char rsa_key_der_2048[] =
@@ -783,6 +792,7 @@ const unsigned char rsa_key_der_2048[] =
 	0x83, 0x0B, 0xD4, 0x74, 0x80, 0xB6, 0x7D, 0x62, 0x45, 0xBF, 
 	0x56
 };
+const int sizeof_rsa_key_der_2048 = sizeof(rsa_key_der_2048);
 
 /* ./certs/ca-cert.der, 2048-bit */
 const unsigned char ca_cert_der_2048[] =
@@ -907,6 +917,7 @@ const unsigned char ca_cert_der_2048[] =
 	0xC0, 0xDB, 0x6D, 0xF3, 0xB2, 0xD9, 0x46, 0xC8, 0x9F, 0xC3, 
 	0xB8, 0x70, 0x5A, 0x1F, 0x7F, 0xCA
 };
+const int sizeof_ca_cert_der_2048 = sizeof(ca_cert_der_2048);
 
 /* ./certs/server-key.der, 2048-bit */
 const unsigned char server_key_der_2048[] =
@@ -1032,6 +1043,7 @@ const unsigned char server_key_der_2048[] =
 	0x7C, 0x9A, 0x1F, 0x0C, 0x7C, 0xA9, 0xB0, 0x0E, 0x21, 0x37, 
 	0x3B, 0xF1, 0xB0
 };
+const int sizeof_server_key_der_2048 = sizeof(server_key_der_2048);
 
 /* ./certs/server-cert.der, 2048-bit */
 const unsigned char server_cert_der_2048[] =
@@ -1129,6 +1141,7 @@ const unsigned char server_cert_der_2048[] =
 	0x67, 0x95, 0x78, 0xB7, 0x02, 0x06, 0xD5, 0xA7, 0x61, 0xBD, 
 	0xEF, 0x3A, 0xFC, 0xB2, 0x61, 0xCD
 };
+const int sizeof_server_cert_der_2048 = sizeof(server_cert_der_2048);
 
 #endif /* USE_CERT_BUFFERS_1024 */