WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #11220 from LinuxJedi/fix-se050-asn-key-to-der-guards 

Fix ASN guards for RSA key DER export
pull/11235/head
philljj 2026-08-21 10:39:00 -05:00 committed by GitHub
parent c5d9483cce 9de9f6639c
commit 4d1bd552d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/disable-pk-algs.yml vendored
View File

@ -76,6 +76,10 @@ jobs:
"configs": [
{"name": "rsa-dh", "minutes": 1.2,
"configure": ["--enable-rsa", "--enable-dh"]},
{"name": "rsa-key-to-der-original-asn", "minutes": 0.3,
"check": false,
"configure": ["--enable-rsa", "--enable-asn=original",
"--disable-dsa", "CPPFLAGS=-DWOLFSSL_KEY_TO_DER"]},
{"name": "ecc", "minutes": 1.2,
"configure": ["--enable-ecc"]},
{"name": "rsa-curve25519", "minutes": 1.2,

13
wolfcrypt/src/asn.c
View File

@ -3534,8 +3534,10 @@ WOLFSSL_LOCAL int SetASNInt(int len, byte firstByte, byte* output)
#endif
#ifndef WOLFSSL_ASN_TEMPLATE
#if !defined(NO_DSA) || defined(HAVE_ECC) || (defined(WOLFSSL_CERT_GEN) && \
!defined(NO_RSA)) || ((defined(WOLFSSL_KEY_GEN) || \
#if !defined(NO_DSA) || defined(HAVE_ECC) || \
(!defined(NO_RSA) && defined(WOLFSSL_KEY_TO_DER)) || \
(defined(WOLFSSL_CERT_GEN) && !defined(NO_RSA)) || \
((defined(WOLFSSL_KEY_GEN) || \
(!defined(NO_DH) && defined(WOLFSSL_DH_EXTRA)) || \
defined(OPENSSL_EXTRA)) && !defined(NO_RSA))
/* Set the DER/BER encoding of the ASN.1 INTEGER element with an mp_int.
@ -4048,11 +4050,12 @@ int CheckBitString(const byte* input, word32* inOutIdx, int* len,
#endif
}
/* RSA (with CertGen or KeyGen) OR ECC OR ED25519 OR ED448 (with CertGen or
* KeyGen) OR CRL */
/* RSA (with CertGen, KeyGen or KeyToDer) OR ECC OR ED25519 OR ED448 (with
* CertGen or KeyGen) OR CRL */
#if (!defined(NO_RSA) && \
(defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN) || \
defined(OPENSSL_EXTRA))) || \
defined(OPENSSL_EXTRA) || \
(defined(WOLFSSL_KEY_TO_DER) && !defined(NO_CERTS)))) || \
(defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT)) || \
((defined(HAVE_ED25519) || defined(HAVE_ED448)) && \
(defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN) || \