Skip to content

Commit 4055b0d

Browse files
dgarskedgarske
committed
Fix for some variable null checks that are not needed.
1 parent cd0301f commit 4055b0d

1 file changed

Lines changed: 13 additions & 34 deletions

File tree

‎wolfcrypt/benchmark/benchmark.c‎

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4251,6 +4251,12 @@ static void bench_aesgcm_internal(int useDeviceID,
42514251

42524252
WC_ALLOC_VAR(bench_additional, byte, AES_AUTH_ADD_SZ, HEAP_HINT);
42534253
WC_ALLOC_VAR(bench_tag, byte, AES_AUTH_TAG_SZ, HEAP_HINT);
4254+
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
4255+
if (bench_additional == NULL || bench_tag == NULL) {
4256+
ret = MEMORY_E;
4257+
goto exit;
4258+
}
4259+
#endif
42544260

42554261
WC_CALLOC_ARRAY(enc, Aes, BENCH_MAX_PENDING,
42564262
sizeof(Aes), HEAP_HINT);
@@ -4259,17 +4265,6 @@ static void bench_aesgcm_internal(int useDeviceID,
42594265
sizeof(Aes), HEAP_HINT);
42604266
#endif
42614267

4262-
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
4263-
if (bench_additional == NULL || bench_tag == NULL || enc == NULL
4264-
#ifdef HAVE_AES_DECRYPT
4265-
|| dec == NULL
4266-
#endif
4267-
) {
4268-
ret = MEMORY_E;
4269-
goto exit;
4270-
}
4271-
#endif
4272-
42734268
XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ);
42744269
XMEMSET(bench_tag, 0, AES_AUTH_TAG_SZ);
42754270

@@ -4425,6 +4420,12 @@ static void bench_aesgcm_stream_internal(int useDeviceID,
44254420

44264421
WC_ALLOC_VAR(bench_additional, byte, AES_AUTH_ADD_SZ, HEAP_HINT);
44274422
WC_ALLOC_VAR(bench_tag, byte, AES_AUTH_TAG_SZ, HEAP_HINT);
4423+
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
4424+
if (bench_additional == NULL || bench_tag == NULL) {
4425+
ret = MEMORY_E;
4426+
goto exit;
4427+
}
4428+
#endif
44284429

44294430
WC_CALLOC_ARRAY(enc, Aes, BENCH_MAX_PENDING,
44304431
sizeof(Aes), HEAP_HINT);
@@ -4433,17 +4434,6 @@ static void bench_aesgcm_stream_internal(int useDeviceID,
44334434
sizeof(Aes), HEAP_HINT);
44344435
#endif
44354436

4436-
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
4437-
if (bench_additional == NULL || bench_tag == NULL || enc == NULL
4438-
#ifdef HAVE_AES_DECRYPT
4439-
|| dec == NULL
4440-
#endif
4441-
) {
4442-
ret = MEMORY_E;
4443-
goto exit;
4444-
}
4445-
#endif
4446-
44474437
XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ);
44484438
XMEMSET(bench_tag, 0, AES_AUTH_TAG_SZ);
44494439

@@ -5002,7 +4992,6 @@ void bench_aesxts(void)
50024992
};
50034993

50044994
WC_ALLOC_VAR(aes, XtsAes, 1, HEAP_HINT);
5005-
50064995
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
50074996
if (aes == NULL){
50084997
ret = MEMORY_E;
@@ -5154,7 +5143,6 @@ void bench_aesccm(int useDeviceID)
51545143

51555144
WC_ALLOC_VAR(bench_additional, byte, AES_AUTH_ADD_SZ, HEAP_HINT);
51565145
WC_ALLOC_VAR(bench_tag, byte, AES_AUTH_TAG_SZ, HEAP_HINT);
5157-
51585146
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
51595147
if (bench_additional == NULL || bench_tag == NULL) {
51605148
ret = MEMORY_E;
@@ -8499,7 +8487,7 @@ static void bench_rsa_helper(int useDeviceID,
84998487
rsaKeySz, HEAP_HINT);
85008488

85018489
#if (!defined(WOLFSSL_RSA_VERIFY_INLINE) && \
8502-
!defined(WOLFSSL_RSA_PUBLIC_ONLY))
8490+
!defined(WOLFSSL_RSA_PUBLIC_ONLY))
85038491
WC_ALLOC_HEAP_ARRAY(out, byte, BENCH_MAX_PENDING,
85048492
rsaKeySz, HEAP_HINT);
85058493
if (out[0] == NULL) {
@@ -11524,7 +11512,6 @@ void bench_ed448KeySign(void)
1152411512
#endif
1152511513

1152611514
WC_ALLOC_VAR(genKey, ed448_key, 1, HEAP_HINT);
11527-
1152811515
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
1152911516
if (genKey == NULL) {
1153011517
ret = MEMORY_E;
@@ -11617,7 +11604,6 @@ void bench_eccsiKeyGen(void)
1161711604
DECLARE_MULTI_VALUE_STATS_VARS()
1161811605

1161911606
WC_ALLOC_VAR(genKey, EccsiKey, 1, HEAP_HINT);
11620-
1162111607
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
1162211608
if (genKey == NULL) {
1162311609
ret = MEMORY_E;
@@ -11669,7 +11655,6 @@ void bench_eccsiPairGen(void)
1166911655

1167011656
WC_ALLOC_VAR(genKey, EccsiKey, 1, HEAP_HINT);
1167111657
WC_ALLOC_VAR(ssk, mp_int, 1, HEAP_HINT);
11672-
1167311658
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
1167411659
if (genKey == NULL || ssk == NULL) {
1167511660
ret = MEMORY_E;
@@ -11733,7 +11718,6 @@ void bench_eccsiValidate(void)
1173311718

1173411719
WC_ALLOC_VAR(genKey, EccsiKey, 1, HEAP_HINT);
1173511720
WC_ALLOC_VAR(ssk, mp_int, 1, HEAP_HINT);
11736-
1173711721
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
1173811722
if (genKey == NULL || ssk == NULL) {
1173911723
ret = MEMORY_E;
@@ -11803,7 +11787,6 @@ void bench_eccsi(void)
1180311787

1180411788
WC_ALLOC_VAR(genKey, EccsiKey, 1, HEAP_HINT);
1180511789
WC_ALLOC_VAR(ssk, mp_int, 1, HEAP_HINT);
11806-
1180711790
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
1180811791
if (genKey == NULL || ssk == NULL) {
1180911792
ret = MEMORY_E;
@@ -11897,7 +11880,6 @@ void bench_sakkeKeyGen(void)
1189711880
DECLARE_MULTI_VALUE_STATS_VARS()
1189811881

1189911882
WC_ALLOC_VAR(genKey, SakkeKey, 1, HEAP_HINT);
11900-
1190111883
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
1190211884
if (genKey == NULL) {
1190311885
ret = MEMORY_E;
@@ -11947,7 +11929,6 @@ void bench_sakkeRskGen(void)
1194711929
DECLARE_MULTI_VALUE_STATS_VARS()
1194811930

1194911931
WC_ALLOC_VAR(genKey, SakkeKey, 1, HEAP_HINT);
11950-
1195111932
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
1195211933
if (genKey == NULL) {
1195311934
ret = MEMORY_E;
@@ -12005,7 +11986,6 @@ void bench_sakkeValidate(void)
1200511986
DECLARE_MULTI_VALUE_STATS_VARS()
1200611987

1200711988
WC_ALLOC_VAR(genKey, SakkeKey, 1, HEAP_HINT);
12008-
1200911989
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
1201011990
if (genKey == NULL) {
1201111991
ret = MEMORY_E;
@@ -12072,7 +12052,6 @@ void bench_sakke(void)
1207212052
DECLARE_MULTI_VALUE_STATS_VARS()
1207312053

1207412054
WC_ALLOC_VAR(genKey, SakkeKey, 1, HEAP_HINT);
12075-
1207612055
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
1207712056
if (genKey == NULL) {
1207812057
ret = MEMORY_E;

0 commit comments

Comments
 (0)