wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-02-01 16:19:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into apache-fixes

Browse Source
This commit is contained in:
cariepointer
2020-01-09 16:33:35 -07:00
committed by GitHub
parent 0938cdde52 f3b2815e1f
commit a9cf16cc2b
553 changed files with 3555 additions and 3105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ssl.c
View File

@@ -1,6 +1,6 @@
/* ssl.c
*
* Copyright (C) 2006-2019 wolfSSL Inc.
* Copyright (C) 2006-2020 wolfSSL Inc.
*
* This file is part of wolfSSL.
*
@@ -23553,7 +23553,9 @@ void wolfSSL_EVP_PKEY_free(WOLFSSL_EVP_PKEY* key)
break;
}
wc_FreeMutex(&key->refMutex);
if (wc_FreeMutex(&key->refMutex) != 0) {
WOLFSSL_MSG("Couldn't free pkey mutex");
}
XFREE(key, key->heap, DYNAMIC_TYPE_PUBLIC_KEY);
}
}
@@ -35562,7 +35564,8 @@ err:
#define PEM_END_SZ 9
#define PEM_HDR_FIN "-----"
#define PEM_HDR_FIN_SZ 5
#define PEM_HDR_FIN_EOL "-----\n"
#define PEM_HDR_FIN_EOL_NEWLINE "-----\n"
#define PEM_HDR_FIN_EOL_NULL_TERM "-----\0"
#define PEM_HDR_FIN_EOL_SZ 6
int wolfSSL_PEM_read_bio(WOLFSSL_BIO* bio, char **name, char **header,
@@ -35698,8 +35701,12 @@ err:
ret = WOLFSSL_FAILURE;
}
if (ret == WOLFSSL_SUCCESS) {
if (XSTRNCMP(pem + PEM_END_SZ + nameLen, PEM_HDR_FIN_EOL,
PEM_HDR_FIN_EOL_SZ) != 0) {
if (XSTRNCMP(pem + PEM_END_SZ + nameLen,
PEM_HDR_FIN_EOL_NEWLINE,
PEM_HDR_FIN_EOL_SZ) != 0 &&
XSTRNCMP(pem + PEM_END_SZ + nameLen,
PEM_HDR_FIN_EOL_NULL_TERM,
PEM_HDR_FIN_EOL_SZ) != 0) {
ret = WOLFSSL_FAILURE;
}
}
@@ -35763,8 +35770,8 @@ err:
if (!err)
err = wolfSSL_BIO_write(bio, name, nameLen) != nameLen;
if (!err) {
err = wolfSSL_BIO_write(bio, PEM_HDR_FIN_EOL, PEM_HDR_FIN_EOL_SZ) !=
(int)PEM_HDR_FIN_EOL_SZ;
err = wolfSSL_BIO_write(bio, PEM_HDR_FIN_EOL_NEWLINE,
PEM_HDR_FIN_EOL_SZ) != (int)PEM_HDR_FIN_EOL_SZ;
}
if (!err && headerLen > 0) {
err = wolfSSL_BIO_write(bio, header, headerLen) != headerLen;
@@ -35781,8 +35788,8 @@ err:
if (!err)
err = wolfSSL_BIO_write(bio, name, nameLen) != nameLen;
if (!err) {
err = wolfSSL_BIO_write(bio, PEM_HDR_FIN_EOL, PEM_HDR_FIN_EOL_SZ) !=
(int)PEM_HDR_FIN_EOL_SZ;
err = wolfSSL_BIO_write(bio, PEM_HDR_FIN_EOL_NEWLINE,
PEM_HDR_FIN_EOL_SZ) != (int)PEM_HDR_FIN_EOL_SZ;
}
if (!err) {