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

account for existing pkcs8 header

Browse Source
This commit is contained in:
JacobBarthelmeh
2025-03-31 17:24:18 -06:00
parent 3ff4e5e303
commit 57e00e5147
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pk.c
View File

@@ -16499,7 +16499,8 @@ int pkcs8_encrypt(WOLFSSL_EVP_PKEY* pkey,
if (ret == 0) { if (ret == 0) {
/* Encrypt private into buffer. */ /* Encrypt private into buffer. */
ret = TraditionalEnc((byte*)pkey->pkey.ptr, (word32)pkey->pkey_sz, ret = TraditionalEnc((byte*)pkey->pkey.ptr + pkey->pkcs8HeaderSz,
(word32)pkey->pkey_sz - pkey->pkcs8HeaderSz,
key, keySz, passwd, passwdSz, PKCS5, PBES2, encAlgId, key, keySz, passwd, passwdSz, PKCS5, PBES2, encAlgId,
NULL, 0, WC_PKCS12_ITT_DEFAULT, &rng, NULL); NULL, 0, WC_PKCS12_ITT_DEFAULT, &rng, NULL);
if (ret > 0) { if (ret > 0) {
@@ -16580,8 +16581,9 @@ int pkcs8_encode(WOLFSSL_EVP_PKEY* pkey, byte* key, word32* keySz)
if (ret >= 0) { if (ret >= 0) {
/* Encode private key in PKCS#8 format. */ /* Encode private key in PKCS#8 format. */
ret = wc_CreatePKCS8Key(key, keySz, (byte*)pkey->pkey.ptr, ret = wc_CreatePKCS8Key(key, keySz, (byte*)pkey->pkey.ptr +
(word32)pkey->pkey_sz, algId, curveOid, oidSz); pkey->pkcs8HeaderSz, (word32)pkey->pkey_sz - pkey->pkcs8HeaderSz,
algId, curveOid, oidSz);
} }
return ret; return ret;