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

Merge pull request #519 from dgarske/fix_compat_wo_ecc

Browse Source 
Fix for openssl compatibility without ECC
This commit is contained in:
toddouska
2016-08-08 13:46:58 -07:00
committed by GitHub
parent 76e8438059 b0e4acaac1
commit a8b2ced588
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@ -17878,10 +17878,11 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl)
return NULL; return NULL;
} }
#ifdef HAVE_ECC
const char * wolf_OBJ_nid2sn(int n) { const char * wolf_OBJ_nid2sn(int n) {
int i; int i;
WOLFSSL_ENTER("wolf_OBJ_nid2sn"); WOLFSSL_ENTER("wolf_OBJ_nid2sn");
/* find based on NID and return name */ /* find based on NID and return name */
for (i = 0; i < ecc_sets[i].size; i++) { for (i = 0; i < ecc_sets[i].size; i++) {
if (n == ecc_sets[i].id) { if (n == ecc_sets[i].id) {
@ -17904,13 +17905,14 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl)
WOLFSSL_ENTER("wolf_OBJ_osn2nid"); WOLFSSL_ENTER("wolf_OBJ_osn2nid");
/* find based on name and return NID */ /* find based on name and return NID */
for (i = 0; i < ecc_sets[i].size; i++) { for (i = 0; i < ecc_sets[i].size; i++) {
if (XSTRNCMP(sn, ecc_sets[i].name, ECC_MAXNAME) == 0) { if (XSTRNCMP(sn, ecc_sets[i].name, ECC_MAXNAME) == 0) {
return ecc_sets[i].id; return ecc_sets[i].id;
} }
} }
return -1; return -1;
} }
#endif /* HAVE_ECC */
WOLFSSL_X509 *PEM_read_bio_WOLFSSL_X509(WOLFSSL_BIO *bp, WOLFSSL_X509 **x, pem_password_cb *cb, void *u) { WOLFSSL_X509 *PEM_read_bio_WOLFSSL_X509(WOLFSSL_BIO *bp, WOLFSSL_X509 **x, pem_password_cb *cb, void *u) {