From 2526d91300e75f0c9959751974040e071b8e96bb Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Thu, 23 Jan 2025 23:56:28 -0700 Subject: [PATCH] formating for line length and guard on access to EncryptedInfo struct --- src/internal.c | 3 ++- src/x509.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/internal.c b/src/internal.c index 9dfba9155..063d06394 100644 --- a/src/internal.c +++ b/src/internal.c @@ -37929,7 +37929,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx, #ifdef HAVE_SERVER_RENEGOTIATION_INFO /* check for TLS_EMPTY_RENEGOTIATION_INFO_SCSV suite */ - if (FindSuite(ssl->clSuites, 0, TLS_EMPTY_RENEGOTIATION_INFO_SCSV) >= 0) { + if (FindSuite(ssl->clSuites, 0, TLS_EMPTY_RENEGOTIATION_INFO_SCSV) >= + 0) { TLSX* extension; /* check for TLS_EMPTY_RENEGOTIATION_INFO_SCSV suite */ diff --git a/src/x509.c b/src/x509.c index ed3d8865d..b6a04c360 100644 --- a/src/x509.c +++ b/src/x509.c @@ -5312,8 +5312,10 @@ static WOLFSSL_X509* loadX509orX509REQFromBuffer( if (format == WOLFSSL_FILETYPE_PEM) { EncryptedInfo info; XMEMSET(&info, 0, sizeof(EncryptedInfo)); + #ifdef WOLFSSL_ENCRYPTED_KEYS info.passwd_cb = cb; info.passwd_userdata = u; + #endif #ifdef WOLFSSL_PEM_TO_DER ret = PemToDer(buf, sz, type, &der, NULL, &info, NULL);