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

Jenkins fixes

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2024-05-07 10:42:33 +02:00
parent 589bdba256
commit 14ce8ce198
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.c
View File

@@ -37860,7 +37860,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#endif #endif
if (sess == NULL) { if (sess == NULL) {
ret = TlsSessionCacheGetAndRdLock(id, &sess, &freeCtx->row, ret = TlsSessionCacheGetAndRdLock(id, &sess, &freeCtx->row,
ssl->options.side); (byte)ssl->options.side);
if (ret != 0) if (ret != 0)
sess = NULL; sess = NULL;
} }

5
src/x509.c
View File

@@ -11678,8 +11678,9 @@ err:
"-----BEGIN X509 CRL-----")) { "-----BEGIN X509 CRL-----")) {
/* We have a crl */ /* We have a crl */
WOLFSSL_MSG("Parsing crl"); WOLFSSL_MSG("Parsing crl");
if((PemToDer((const unsigned char*) header, footerEnd - header, if((PemToDer((const unsigned char*) header,
CRL_TYPE, &der, NULL, NULL, NULL)) < 0) { (long)(footerEnd - header), CRL_TYPE, &der, NULL, NULL,
NULL)) < 0) {
WOLFSSL_MSG("PemToDer error"); WOLFSSL_MSG("PemToDer error");
goto err; goto err;
} }

4
wolfcrypt/test/test.c
View File

@@ -1679,7 +1679,7 @@ options: [-s max_relative_stack_bytes] [-m max_relative_heap_memory_bytes]\n\
#if defined(USE_CERT_BUFFERS_2048) && \ #if defined(USE_CERT_BUFFERS_2048) && \
defined(HAVE_PKCS12) && \ defined(HAVE_PKCS12) && \
!defined(NO_ASN) && !defined(NO_PWDBASED) && !defined(NO_HMAC) && \ !defined(NO_ASN) && !defined(NO_PWDBASED) && !defined(NO_HMAC) && \
!defined(NO_CERTS) !defined(NO_CERTS) && !defined(NO_DES3)
if ( (ret = pkcs12_test()) != 0) if ( (ret = pkcs12_test()) != 0)
TEST_FAIL("PKCS12 test failed!\n", ret); TEST_FAIL("PKCS12 test failed!\n", ret);
else else
@@ -24870,7 +24870,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t pwdbased_test(void)
#if defined(USE_CERT_BUFFERS_2048) && \ #if defined(USE_CERT_BUFFERS_2048) && \
defined(HAVE_PKCS12) && \ defined(HAVE_PKCS12) && \
!defined(NO_ASN) && !defined(NO_PWDBASED) && !defined(NO_HMAC) && \ !defined(NO_ASN) && !defined(NO_PWDBASED) && !defined(NO_HMAC) && \
!defined(NO_CERTS) !defined(NO_CERTS) && !defined(NO_DES3)
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t pkcs12_test(void) WOLFSSL_TEST_SUBROUTINE wc_test_ret_t pkcs12_test(void)
{ {
wc_test_ret_t ret = 0; wc_test_ret_t ret = 0;

2
wolfssl/ssl.h
View File

@@ -37,6 +37,7 @@
#include <wolfssl/wolfcrypt/logging.h> #include <wolfssl/wolfcrypt/logging.h>
#include <wolfssl/wolfcrypt/memory.h> #include <wolfssl/wolfcrypt/memory.h>
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
#include <wolfssl/wolfcrypt/pkcs12.h>
/* For the types */ /* For the types */
#include <wolfssl/openssl/compat_types.h> #include <wolfssl/openssl/compat_types.h>
@@ -2973,7 +2974,6 @@ WOLFSSL_API int wolfSSL_connect_cert(WOLFSSL* ssl);
/* PKCS12 compatibility */ /* PKCS12 compatibility */
typedef struct WC_PKCS12 WC_PKCS12;
WOLFSSL_API WC_PKCS12* wolfSSL_d2i_PKCS12_bio(WOLFSSL_BIO* bio, WOLFSSL_API WC_PKCS12* wolfSSL_d2i_PKCS12_bio(WOLFSSL_BIO* bio,
WC_PKCS12** pkcs12); WC_PKCS12** pkcs12);
WOLFSSL_API int wolfSSL_i2d_PKCS12_bio(WOLFSSL_BIO *bio, WC_PKCS12 *pkcs12); WOLFSSL_API int wolfSSL_i2d_PKCS12_bio(WOLFSSL_BIO *bio, WC_PKCS12 *pkcs12);

4
wolfssl/wolfcrypt/pkcs12.h
View File

@@ -29,9 +29,7 @@
extern "C" { extern "C" {
#endif #endif
#ifndef WOLFSSL_TYPES_DEFINED /* do not redeclare from ssl.h */ typedef struct WC_PKCS12 WC_PKCS12;
typedef struct WC_PKCS12 WC_PKCS12;
#endif
typedef struct WC_DerCertList { /* dereferenced in ssl.c */ typedef struct WC_DerCertList { /* dereferenced in ssl.c */
byte* buffer; byte* buffer;