wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

(void) for unused in NO_RSA case

Browse Source
This commit is contained in:
Takashi Kojo
2018-09-15 09:29:43 +09:00
committed by Go Hosohara
parent dc06bb075d
commit 71863c462e
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ssl.c
View File

@@ -5891,10 +5891,6 @@ int wolfSSL_CertManagerVerify(WOLFSSL_CERT_MANAGER* cm, const char* fname,
if (file == XBADFILE) return WOLFSSL_BAD_FILE;
if(XFSEEK(file, 0, XSEEK_END) != 0)
return WOLFSSL_BAD_FILE;
<<<<<<< HEAD
=======
>>>>>>> merge PR #1820 Porting aid
sz = XFTELL(file);
XREWIND(file);
@@ -15284,10 +15280,6 @@ WOLFSSL_X509* wolfSSL_X509_load_certificate_file(const char* fname, int format)
XFCLOSE(file);
return NULL;
}
<<<<<<< HEAD
=======
>>>>>>> merge PR #1820 Porting aid
sz = XFTELL(file);
XREWIND(file);

10
wolfcrypt/src/asn.c
View File

@@ -104,10 +104,6 @@ ASN Options:
#include <wolfssl/wolfcrypt/rsa.h>
#endif
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL) || defined(OPENSSL_EXTRA_X509_SMALL)
#include <wolfssl/openssl/ssl.h> /* for OBJ_sn2nid */
#endif
#ifdef WOLFSSL_DEBUG_ENCODING
#if defined(FREESCALE_MQX) || defined(FREESCALE_KSDK_MQX)
#if MQX_USE_IO_OLD
@@ -2692,9 +2688,9 @@ int wc_GetKeyOID(byte* key, word32 keySz, const byte** curveOID, word32* oidSz,
return BAD_FUNC_ARG;
}
(void)tmpIdx;
(void)curveOID;
(void)oidSz;
(void)tmpIdx;
(void)keySz;
(void)heap;
@@ -2937,6 +2933,8 @@ int UnTraditionalEnc(byte* key, word32 keySz, byte* out, word32* outSz,
(void)rng;
return totalSz + sz;
(void)rng;
}
@@ -3287,6 +3285,8 @@ int EncryptContent(byte* input, word32 inputSz, byte* out, word32* outSz,
(void)rng;
return totalSz;
(void)rng;
}