feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

updated SHOW_SIZES, opionally adds sizes as available, added flag to example client to print sizes

Browse Source
This commit is contained in:
John Safranek
2013-04-08 16:01:52 -07:00
parent 9b0ffa0249
commit b0dca8ea69
2 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
examples/client/client.c
View File

@@ -111,6 +111,9 @@ static void Usage(void)
printf("-m Match domain name in cert\n"); printf("-m Match domain name in cert\n");
printf("-N Use Non-blocking sockets\n"); printf("-N Use Non-blocking sockets\n");
printf("-r Resume session\n"); printf("-r Resume session\n");
#ifdef SHOW_SIZES
printf("-z Print structure sizes\n");
#endif
} }
@@ -167,7 +170,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
(void)sslResume; (void)sslResume;
(void)trackMemory; (void)trackMemory;
while ((ch = mygetopt(argc, argv, "?gdusmNrth:p:v:l:A:c:k:b:")) != -1) { while ((ch = mygetopt(argc, argv, "?gdusmNrth:p:v:l:A:c:k:b:z")) != -1) {
switch (ch) { switch (ch) {
case '?' : case '?' :
Usage(); Usage();
@@ -252,6 +255,12 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
resumeSession = 1; resumeSession = 1;
break; break;
case 'z' :
#ifndef CYASSL_LEANPSK
CyaSSL_GetObjectSize();
#endif
break;
default: default:
Usage(); Usage();
exit(MY_EX_USAGE); exit(MY_EX_USAGE);

43
src/ssl.c
View File

@@ -306,22 +306,47 @@ int CyaSSL_GetObjectSize(void)
#ifdef SHOW_SIZES #ifdef SHOW_SIZES
printf("sizeof suites = %lu\n", sizeof(Suites)); printf("sizeof suites = %lu\n", sizeof(Suites));
printf("sizeof ciphers(2) = %lu\n", sizeof(Ciphers)); printf("sizeof ciphers(2) = %lu\n", sizeof(Ciphers));
printf("\tsizeof arc4 = %lu\n", sizeof(Arc4)); #ifndef NO_RC4
printf("\tsizeof aes = %lu\n", sizeof(Aes)); printf(" sizeof arc4 = %lu\n", sizeof(Arc4));
printf("\tsizeof des3 = %lu\n", sizeof(Des3)); #endif
printf("\tsizeof rabbit = %lu\n", sizeof(Rabbit)); printf(" sizeof aes = %lu\n", sizeof(Aes));
#ifndef NO_DES3
printf(" sizeof des3 = %lu\n", sizeof(Des3));
#endif
#ifndef NO_RABBIT
printf(" sizeof rabbit = %lu\n", sizeof(Rabbit));
#endif
printf("sizeof cipher specs = %lu\n", sizeof(CipherSpecs)); printf("sizeof cipher specs = %lu\n", sizeof(CipherSpecs));
printf("sizeof keys = %lu\n", sizeof(Keys)); printf("sizeof keys = %lu\n", sizeof(Keys));
printf("sizeof MD5 = %lu\n", sizeof(Md5));
printf("sizeof SHA = %lu\n", sizeof(Sha));
printf("sizeof SHA256 = %lu\n", sizeof(Sha256));
printf("sizeof Hashes(2) = %lu\n", sizeof(Hashes)); printf("sizeof Hashes(2) = %lu\n", sizeof(Hashes));
#ifndef NO_MD5
printf(" sizeof MD5 = %lu\n", sizeof(Md5));
#endif
#ifndef NO_SHA
printf(" sizeof SHA = %lu\n", sizeof(Sha));
#endif
#ifndef NO_SHA256
printf(" sizeof SHA256 = %lu\n", sizeof(Sha256));
#endif
#ifdef CYASSL_SHA384
printf(" sizeof SHA384 = %lu\n", sizeof(Sha384));
#endif
#ifdef CYASSL_SHA384
printf(" sizeof SHA512 = %lu\n", sizeof(Sha512));
#endif
printf("sizeof Buffers = %lu\n", sizeof(Buffers)); printf("sizeof Buffers = %lu\n", sizeof(Buffers));
printf("sizeof Options = %lu\n", sizeof(Options)); printf("sizeof Options = %lu\n", sizeof(Options));
printf("sizeof Arrays = %lu\n", sizeof(Arrays)); printf("sizeof Arrays = %lu\n", sizeof(Arrays));
printf("sizeof Session = %lu\n", sizeof(CYASSL_SESSION)); #ifndef NO_RSA
printf("sizeof peerKey = %lu\n", sizeof(RsaKey)); printf("sizeof RsaKey = %lu\n", sizeof(RsaKey));
#endif
#ifdef HAVE_ECC
printf("sizeof ecc_key = %lu\n", sizeof(ecc_key));
#endif
printf("sizeof CYASSL_CIPHER = %lu\n", sizeof(CYASSL_CIPHER)); printf("sizeof CYASSL_CIPHER = %lu\n", sizeof(CYASSL_CIPHER));
printf("sizeof CYASSL_SESSION = %lu\n", sizeof(CYASSL_SESSION));
printf("sizeof CYASSL = %lu\n", sizeof(CYASSL));
printf("sizeof CYASSL_CTX = %lu\n", sizeof(CYASSL_CTX));
#endif #endif
return sizeof(CYASSL); return sizeof(CYASSL);