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

Merge pull request #7952 from douzzer/20240906-GetCAByKeyHash-wolfssl_linuxkm_pie_redirect_table

Browse Source 
20240906-GetCAByKeyHash-wolfssl_linuxkm_pie_redirect_table
This commit is contained in:
JacobBarthelmeh
2024-09-06 15:37:37 -06:00
committed by GitHub
parent e708ef3b56 87aef05f16
commit 398f8c90e2
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
linuxkm/linuxkm_wc_port.h
View File

@ -461,8 +461,11 @@
struct Signer *GetCA(void *signers, unsigned char *hash); struct Signer *GetCA(void *signers, unsigned char *hash);
#ifndef NO_SKID #ifndef NO_SKID
struct Signer *GetCAByName(void* signers, unsigned char *hash); struct Signer *GetCAByName(void* signers, unsigned char *hash);
#endif #ifdef HAVE_OCSP
#endif struct Signer* GetCAByKeyHash(void* vp, const unsigned char* keyHash);
#endif /* HAVE_OCSP */
#endif /* NO_SKID */
#endif /* !WOLFCRYPT_ONLY && !NO_CERTS */
#if defined(__PIE__) && !defined(USE_WOLFSSL_LINUXKM_PIE_REDIRECT_TABLE) #if defined(__PIE__) && !defined(USE_WOLFSSL_LINUXKM_PIE_REDIRECT_TABLE)
#error "compiling -fPIE requires PIE redirect table." #error "compiling -fPIE requires PIE redirect table."
@ -629,8 +632,11 @@
typeof(GetCA) *GetCA; typeof(GetCA) *GetCA;
#ifndef NO_SKID #ifndef NO_SKID
typeof(GetCAByName) *GetCAByName; typeof(GetCAByName) *GetCAByName;
#endif #ifdef HAVE_OCSP
#endif typeof(GetCAByKeyHash) *GetCAByKeyHash;
#endif /* HAVE_OCSP */
#endif /* NO_SKID */
#endif /* !WOLFCRYPT_ONLY && !NO_CERTS */
#ifdef WOLFSSL_DEBUG_BACKTRACE_ERROR_CODES #ifdef WOLFSSL_DEBUG_BACKTRACE_ERROR_CODES
typeof(dump_stack) *dump_stack; typeof(dump_stack) *dump_stack;
@ -778,8 +784,11 @@
#define GetCA (wolfssl_linuxkm_get_pie_redirect_table()->GetCA) #define GetCA (wolfssl_linuxkm_get_pie_redirect_table()->GetCA)
#ifndef NO_SKID #ifndef NO_SKID
#define GetCAByName (wolfssl_linuxkm_get_pie_redirect_table()->GetCAByName) #define GetCAByName (wolfssl_linuxkm_get_pie_redirect_table()->GetCAByName)
#endif #ifdef HAVE_OCSP
#endif #define GetCAByKeyHash (wolfssl_linuxkm_get_pie_redirect_table()->GetCAByKeyHash)
#endif /* HAVE_OCSP */
#endif /* NO_SKID */
#endif /* !WOLFCRYPT_ONLY && !NO_CERTS */
#ifdef WOLFSSL_DEBUG_BACKTRACE_ERROR_CODES #ifdef WOLFSSL_DEBUG_BACKTRACE_ERROR_CODES
#define dump_stack (wolfssl_linuxkm_get_pie_redirect_table()->dump_stack) #define dump_stack (wolfssl_linuxkm_get_pie_redirect_table()->dump_stack)

7
linuxkm/module_hooks.c
View File

@ -577,8 +577,11 @@ static int set_up_wolfssl_linuxkm_pie_redirect_table(void) {
wolfssl_linuxkm_pie_redirect_table.GetCA = GetCA; wolfssl_linuxkm_pie_redirect_table.GetCA = GetCA;
#ifndef NO_SKID #ifndef NO_SKID
wolfssl_linuxkm_pie_redirect_table.GetCAByName = GetCAByName; wolfssl_linuxkm_pie_redirect_table.GetCAByName = GetCAByName;
#endif #ifdef HAVE_OCSP
#endif wolfssl_linuxkm_pie_redirect_table.GetCAByKeyHash = GetCAByKeyHash;
#endif /* HAVE_OCSP */
#endif /* NO_SKID */
#endif /* !WOLFCRYPT_ONLY && !NO_CERTS */
#ifdef WOLFSSL_DEBUG_BACKTRACE_ERROR_CODES #ifdef WOLFSSL_DEBUG_BACKTRACE_ERROR_CODES
wolfssl_linuxkm_pie_redirect_table.dump_stack = dump_stack; wolfssl_linuxkm_pie_redirect_table.dump_stack = dump_stack;

2
wolfssl/internal.h
View File

@ -6466,7 +6466,7 @@ WOLFSSL_LOCAL WC_RNG* WOLFSSL_RSA_GetRNG(WOLFSSL_RSA *rsa, WC_RNG **tmpRNG,
WOLFSSL_LOCAL Signer* GetCAByAKID(void* vp, const byte* issuer, WOLFSSL_LOCAL Signer* GetCAByAKID(void* vp, const byte* issuer,
word32 issuerSz, const byte* serial, word32 serialSz); word32 issuerSz, const byte* serial, word32 serialSz);
#endif #endif
#ifdef HAVE_OCSP #if defined(HAVE_OCSP) && !defined(GetCAByKeyHash)
WOLFSSL_LOCAL Signer* GetCAByKeyHash(void* vp, const byte* keyHash); WOLFSSL_LOCAL Signer* GetCAByKeyHash(void* vp, const byte* keyHash);
#endif #endif
#if !defined(NO_SKID) && !defined(GetCAByName) #if !defined(NO_SKID) && !defined(GetCAByName)