Skip to content

Commit ebdc8b9

Browse files
JacobBarthelmehJacobBarthelmeh
committed
rename of macros, add descriptions, minor fixes
1 parent 511c403 commit ebdc8b9

11 files changed

Lines changed: 67 additions & 54 deletions

File tree

‎configure.ac‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8077,13 +8077,13 @@ do
80778077
;;
80788078
no)
80798079
;;
8080-
small)
8080+
small|lean)
80818081
ENABLED_STATICMEMORY=yes
8082-
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_LEAN_STATIC_MEMORY"
8082+
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_STATIC_MEMORY_LEAN"
80838083
;;
80848084
debug)
80858085
ENABLED_STATICMEMORY=yes
8086-
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DEBUG_MEMORY_CALLBACK"
8086+
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_STATIC_MEMORY_DEBUG_CALLBACK"
80878087
;;
80888088
*)
80898089
AC_MSG_ERROR([Invalid choice for staticmemory.])

‎examples/client/client.c‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1865,7 +1865,8 @@ static int client_srtp_test(WOLFSSL *ssl, func_args *args)
18651865
}
18661866
#endif /* WOLFSSL_SRTP */
18671867

1868-
#ifdef WOLFSSL_DEBUG_MEMORY_CALLBACK
1868+
#if defined(WOLFSSL_STATIC_MEMORY) && \
1869+
defined(WOLFSSL_STATIC_MEMORY_DEBUG_CALLBACK)
18691870
static void ExampleDebugMemoryCb(size_t sz, int bucketSz, byte st, int type) {
18701871
switch (st) {
18711872
case WOLFSSL_DEBUG_MEMORY_ALLOC:
@@ -2128,7 +2129,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
21282129
byte memory[80000];
21292130
#endif
21302131
byte memoryIO[34500]; /* max for IO buffer (TLS packet can be 16k) */
2131-
#if !defined(WOLFSSL_LEAN_STATIC_MEMORY)
2132+
#if !defined(WOLFSSL_STATIC_MEMORY_LEAN)
21322133
WOLFSSL_MEM_CONN_STATS ssl_stats;
21332134
#if defined(DEBUG_WOLFSSL)
21342135
WOLFSSL_MEM_STATS mem_stats;
@@ -3060,7 +3061,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
30603061

30613062

30623063
#ifdef WOLFSSL_STATIC_MEMORY
3063-
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_LEAN_STATIC_MEMORY)
3064+
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_STATIC_MEMORY_LEAN)
30643065
/* print off helper buffer sizes for use with static memory
30653066
* printing to stderr in case of debug mode turned on */
30663067
LOG_ERROR("static memory management size = %d\n",
@@ -3077,7 +3078,8 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
30773078
err_sys("unable to load static memory");
30783079
}
30793080

3080-
#ifdef WOLFSSL_DEBUG_MEMORY_CALLBACK
3081+
#if defined(WOLFSSL_STATIC_MEMORY) && \
3082+
defined(WOLFSSL_STATIC_MEMORY_DEBUG_CALLBACK)
30813083
wolfSSL_SetDebugMemoryCb(ExampleDebugMemoryCb);
30823084
#endif
30833085
ctx = wolfSSL_CTX_new_ex(method(heap), heap);
@@ -3622,7 +3624,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
36223624
#endif
36233625

36243626
#if defined(WOLFSSL_STATIC_MEMORY) && defined(DEBUG_WOLFSSL) && \
3625-
!defined(WOLFSSL_LEAN_STATIC_MEMORY)
3627+
!defined(WOLFSSL_STATIC_MEMORY_LEAN)
36263628
LOG_ERROR("Before creating SSL\n");
36273629
if (wolfSSL_CTX_is_static_memory(ctx, &mem_stats) != 1)
36283630
err_sys("ctx not using static memory");
@@ -3721,7 +3723,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
37213723
#endif
37223724

37233725
#if defined(WOLFSSL_STATIC_MEMORY) && defined(DEBUG_WOLFSSL) && \
3724-
!defined(WOLFSSL_LEAN_STATIC_MEMORY)
3726+
!defined(WOLFSSL_STATIC_MEMORY_LEAN)
37253727
LOG_ERROR("After creating SSL\n");
37263728
if (wolfSSL_CTX_is_static_memory(ctx, &mem_stats) != 1)
37273729
err_sys("ctx not using static memory");
@@ -4429,7 +4431,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
44294431
#endif
44304432

44314433
/* display collected statistics */
4432-
#if defined(WOLFSSL_STATIC_MEMORY) && !defined(WOLFSSL_LEAN_STATIC_MEMORY)
4434+
#if defined(WOLFSSL_STATIC_MEMORY) && !defined(WOLFSSL_STATIC_MEMORY_LEAN)
44334435
if (wolfSSL_is_static_memory(ssl, &ssl_stats) != 1)
44344436
err_sys("static memory was not used with ssl");
44354437

@@ -4656,7 +4658,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
46564658
wolfSSL_shutdown(sslResume); /* bidirectional shutdown */
46574659

46584660
/* display collected statistics */
4659-
#if defined(WOLFSSL_STATIC_MEMORY) && !defined(WOLFSSL_LEAN_STATIC_MEMORY)
4661+
#if defined(WOLFSSL_STATIC_MEMORY) && !defined(WOLFSSL_STATIC_MEMORY_LEAN)
46604662
if (wolfSSL_is_static_memory(sslResume, &ssl_stats) != 1)
46614663
err_sys("static memory was not used with ssl");
46624664

‎examples/server/server.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
16011601
byte memory[80000];
16021602
#endif
16031603
byte memoryIO[34500]; /* max for IO buffer (TLS packet can be 16k) */
1604-
#if !defined(WOLFSSL_LEAN_STATIC_MEMORY)
1604+
#if !defined(WOLFSSL_STATIC_MEMORY_LEAN)
16051605
WOLFSSL_MEM_CONN_STATS ssl_stats;
16061606
#if defined(DEBUG_WOLFSSL)
16071607
WOLFSSL_MEM_STATS mem_stats;
@@ -2505,7 +2505,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
25052505
err_sys_ex(runWithErrors, "unable to get method");
25062506

25072507
#ifdef WOLFSSL_STATIC_MEMORY
2508-
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_LEAN_STATIC_MEMORY)
2508+
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_STATIC_MEMORY_LEAN)
25092509
/* print off helper buffer sizes for use with static memory
25102510
* printing to stderr in case of debug mode turned on */
25112511
LOG_ERROR("static memory management size = %d\n",
@@ -2967,7 +2967,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
29672967
}
29682968
}
29692969
#if defined(WOLFSSL_STATIC_MEMORY) && defined(DEBUG_WOLFSSL) && \
2970-
!defined(WOLFSSL_LEAN_STATIC_MEMORY)
2970+
!defined(WOLFSSL_STATIC_MEMORY_LEAN)
29712971
LOG_ERROR("Before creating SSL\n");
29722972
if (wolfSSL_CTX_is_static_memory(ctx, &mem_stats) != 1)
29732973
err_sys_ex(runWithErrors, "ctx not using static memory");
@@ -3057,7 +3057,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
30573057
#endif
30583058

30593059
#if defined(WOLFSSL_STATIC_MEMORY) && defined(DEBUG_WOLFSSL) && \
3060-
!defined(WOLFSSL_LEAN_STATIC_MEMORY)
3060+
!defined(WOLFSSL_STATIC_MEMORY_LEAN)
30613061
LOG_ERROR("After creating SSL\n");
30623062
if (wolfSSL_CTX_is_static_memory(ctx, &mem_stats) != 1)
30633063
err_sys_ex(runWithErrors, "ctx not using static memory");
@@ -3803,7 +3803,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
38033803
}
38043804

38053805
/* display collected statistics */
3806-
#if defined(WOLFSSL_STATIC_MEMORY) && !defined(WOLFSSL_LEAN_STATIC_MEMORY)
3806+
#if defined(WOLFSSL_STATIC_MEMORY) && !defined(WOLFSSL_STATIC_MEMORY_LEAN)
38073807
if (wolfSSL_is_static_memory(ssl, &ssl_stats) != 1)
38083808
err_sys_ex(runWithErrors, "static memory was not used with ssl");
38093809

‎src/internal.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7242,7 +7242,7 @@ int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup)
72427242
ctx_hint = ((WOLFSSL_HEAP_HINT*)(ctx->heap));
72437243

72447244
ssl_hint->memory = ctx_hint->memory;
7245-
#ifndef WOLFSSL_LEAN_STATIC_MEMORY
7245+
#ifndef WOLFSSL_STATIC_MEMORY_LEAN
72467246
/* lock and check IO count / handshake count */
72477247
if (wc_LockMutex(&(ctx_hint->memory->memory_mutex)) != 0) {
72487248
WOLFSSL_MSG("Bad memory_mutex lock");
@@ -7305,7 +7305,7 @@ int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup)
73057305
}
73067306
wc_UnLockMutex(&(ctx_hint->memory->memory_mutex));
73077307
}
7308-
#endif /* !WOLFSSL_LEAN_STATIC_MEMORY */
7308+
#endif /* !WOLFSSL_STATIC_MEMORY_LEAN */
73097309
#ifdef WOLFSSL_HEAP_TEST
73107310
}
73117311
#endif
@@ -8385,7 +8385,7 @@ void SSL_ResourceFree(WOLFSSL* ssl)
83858385
if (ssl->heap != (void*)WOLFSSL_HEAP_TEST) {
83868386
#endif
83878387
void* heap = ssl->ctx ? ssl->ctx->heap : ssl->heap;
8388-
#ifndef WOLFSSL_LEAN_STATIC_MEMORY
8388+
#ifndef WOLFSSL_STATIC_MEMORY_LEAN
83898389
WOLFSSL_HEAP_HINT* ssl_hint = (WOLFSSL_HEAP_HINT*)ssl->heap;
83908390
WOLFSSL_HEAP* ctx_heap;
83918391

@@ -8415,7 +8415,7 @@ void SSL_ResourceFree(WOLFSSL* ssl)
84158415
if (ctx_heap->flag & WOLFMEM_TRACK_STATS) {
84168416
XFREE(ssl_hint->stats, heap, DYNAMIC_TYPE_SSL);
84178417
}
8418-
#endif /* !WOLFSSL_LEAN_STATIC_MEMORY */
8418+
#endif /* !WOLFSSL_STATIC_MEMORY_LEAN */
84198419
XFREE(ssl->heap, heap, DYNAMIC_TYPE_SSL);
84208420
#ifdef WOLFSSL_HEAP_TEST
84218421
}
@@ -8688,7 +8688,7 @@ void FreeHandshakeResources(WOLFSSL* ssl)
86888688
WOLFSSL_MSG("Bad memory_mutex lock");
86898689
}
86908690
#endif
8691-
#ifndef WOLFSSL_LEAN_STATIC_MEMORY
8691+
#ifndef WOLFSSL_STATIC_MEMORY_LEAN
86928692
if (ctx_heap->curHa > 0) {
86938693
ctx_heap->curHa--;
86948694
}

‎src/ssl.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2573,7 +2573,7 @@ int wolfSSL_is_static_memory(WOLFSSL* ssl, WOLFSSL_MEM_CONN_STATS* mem_stats)
25732573
}
25742574
WOLFSSL_ENTER("wolfSSL_is_static_memory");
25752575

2576-
#ifndef WOLFSSL_LEAN_STATIC_MEMORY
2576+
#ifndef WOLFSSL_STATIC_MEMORY_LEAN
25772577
/* fill out statistics if wanted and WOLFMEM_TRACK_STATS flag */
25782578
if (mem_stats != NULL && ssl->heap != NULL) {
25792579
WOLFSSL_HEAP_HINT* hint = ((WOLFSSL_HEAP_HINT*)(ssl->heap));
@@ -2596,7 +2596,7 @@ int wolfSSL_CTX_is_static_memory(WOLFSSL_CTX* ctx, WOLFSSL_MEM_STATS* mem_stats)
25962596
}
25972597
WOLFSSL_ENTER("wolfSSL_CTX_is_static_memory");
25982598

2599-
#ifndef WOLFSSL_LEAN_STATIC_MEMORY
2599+
#ifndef WOLFSSL_STATIC_MEMORY_LEAN
26002600
/* fill out statistics if wanted */
26012601
if (mem_stats != NULL && ctx->heap != NULL) {
26022602
WOLFSSL_HEAP* heap = ((WOLFSSL_HEAP_HINT*)(ctx->heap))->memory;

‎tests/api.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66534,15 +66534,15 @@ static int test_wolfSSL_CTX_StaticMemory_SSL(WOLFSSL_CTX* ctx)
6653466534
ExpectNull((ssl3 = wolfSSL_new(ctx)));
6653566535

6653666536
if (wolfSSL_is_static_memory(ssl1, &ssl_stats) == 1) {
66537-
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_LEAN_STATIC_MEMORY)
66537+
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_STATIC_MEMORY_LEAN)
6653866538
wolfSSL_PrintStatsConn(&ssl_stats);
6653966539
#endif
6654066540
(void)ssl_stats;
6654166541
}
6654266542

6654366543
/* display collected statistics */
6654466544
if (wolfSSL_CTX_is_static_memory(ctx, &mem_stats) == 1) {
66545-
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_LEAN_STATIC_MEMORY)
66545+
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_STATIC_MEMORY_LEAN)
6654666546
wolfSSL_PrintStats(&mem_stats);
6654766547
#endif
6654866548
(void)mem_stats;

0 commit comments

Comments
 (0)