Skip to content

Commit ed1243a

Browse files
committed
Add missing OpenSSL functions
Signed-off-by: Jonh Wendell <[email protected]>
1 parent 0b6088d commit ed1243a

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

bssl-compat/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ add_library(bssl-compat STATIC
8080
source/EVP_MD_CTX_init.cc
8181
source/EVP_MD_CTX_move.cc
8282
source/EVP_parse_public_key.cc
83+
source/EVP_parse_private_key.cc
8384
source/EVP_PKEY_get0_EC_KEY.cc
8485
source/EVP_PKEY_get0_RSA.cc
8586
source/EVP_PKEY_get1_EC_KEY.cc
@@ -426,6 +427,7 @@ target_add_bssl_function(bssl-compat
426427
EVP_DigestFinal_ex
427428
EVP_DigestInit
428429
EVP_DigestInit_ex
430+
EVP_DigestSign
429431
EVP_DigestSignInit
430432
EVP_DigestSignUpdate
431433
EVP_DigestUpdate
@@ -457,6 +459,7 @@ target_add_bssl_function(bssl-compat
457459
EVP_PKEY_new
458460
EVP_PKEY_set1_RSA
459461
EVP_PKEY_size
462+
EVP_PKEY_bits
460463
EVP_sha1
461464
EVP_sha224
462465
EVP_sha256

bssl-compat/patch/include/openssl/evp.h.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ uncomment.sh "$1" --comment -h \
1616
--uncomment-func-decl EVP_PKEY_get1_EC_KEY \
1717
--uncomment-macro-redef 'EVP_PKEY_[A-Z0-9_]*' \
1818
--uncomment-func-decl EVP_parse_public_key \
19+
--uncomment-func-decl EVP_parse_private_key \
1920
--uncomment-func-decl EVP_DigestVerifyInit \
2021
--uncomment-func-decl EVP_DigestVerify \
2122
--uncomment-func-decl EVP_PKEY_set1_RSA \
2223
--uncomment-func-decl EVP_PKEY_get_raw_public_key \
24+
--uncomment-func-decl EVP_DigestSign \
2325
--uncomment-func-decl EVP_DigestSignInit \
2426
--uncomment-func-decl EVP_DigestSignUpdate \
2527
--uncomment-func-decl EVP_DigestSignFinal \
@@ -30,6 +32,7 @@ uncomment.sh "$1" --comment -h \
3032
--uncomment-regex 'BORINGSSL_MAKE_DELETER(EVP_PKEY,' \
3133
--uncomment-regex 'BORINGSSL_MAKE_UP_REF(EVP_PKEY,' \
3234
--uncomment-func-decl EVP_PKEY_size \
35+
--uncomment-func-decl EVP_PKEY_bits \
3336
--uncomment-func-decl EVP_SignInit_ex \
3437
--uncomment-func-decl EVP_SignUpdate \
3538
--uncomment-func-decl EVP_SignFinal
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#include <openssl/evp.h>
2+
#include <ossl.h>
3+
#include <openssl/bytestring.h>
4+
5+
6+
/*
7+
* BSSL: https://github.com/google/boringssl/blob/098695591f3a2665fccef83a3732ecfc99acdcdd/src/include/openssl/evp.h#L218-L231
8+
* OSSL: N/A
9+
*/
10+
extern "C" EVP_PKEY *EVP_parse_private_key(CBS *cbs) {
11+
const unsigned char* tmp = cbs->data;
12+
return ossl.ossl_d2i_AutoPrivateKey_ex(NULL, &tmp, cbs->len, NULL, NULL);
13+
}

0 commit comments

Comments
 (0)