Skip to content

Commit 9b4094f

Browse files
tedjpoolejwendell
authored andcommitted
Added missing bssl-compat functions
- ASN1_BMPSTRING_new() - ASN1_UNIVERSALSTRING_new() - ASN1_TYPE_new() - ASN1_TYPE_set() - GENERAL_NAME_set0_othername() Signed-off-by: Ted Poole <tpoole@redhat.com>
1 parent 82b7749 commit 9b4094f

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

bssl-compat/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,9 @@ target_add_bssl_include(bssl-compat
317317
target_add_bssl_function(bssl-compat
318318
ASN1_ENUMERATED_to_BN
319319
ASN1_IA5STRING_free
320+
ASN1_BMPSTRING_new
320321
ASN1_IA5STRING_new
321-
ASN1_IA5STRING_new
322-
ASN1_IA5STRING_new
322+
ASN1_UNIVERSALSTRING_new
323323
ASN1_INTEGER_free
324324
ASN1_INTEGER_new
325325
ASN1_INTEGER_to_BN
@@ -334,6 +334,8 @@ target_add_bssl_function(bssl-compat
334334
ASN1_TIME_diff
335335
ASN1_TIME_new
336336
ASN1_TIME_set
337+
ASN1_TYPE_new
338+
ASN1_TYPE_set
337339
BIO_clear_flags
338340
BIO_clear_retry_flags
339341
BIO_clear_flags
@@ -466,6 +468,7 @@ target_add_bssl_function(bssl-compat
466468
EVP_SignUpdate
467469
EVP_SignFinal
468470
GENERAL_NAME_set0_value
471+
GENERAL_NAME_set0_othername
469472
HMAC
470473
HMAC_CTX_free
471474
HMAC_CTX_new

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ uncomment.sh "$1" --comment -h \
1414
--uncomment-func-decl ASN1_STRING_data \
1515
--uncomment-func-decl ASN1_STRING_length \
1616
--uncomment-func-decl ASN1_STRING_set \
17+
--uncomment-func-decl ASN1_BMPSTRING_new \
1718
--uncomment-func-decl ASN1_IA5STRING_new \
19+
--uncomment-func-decl ASN1_UNIVERSALSTRING_new \
1820
--uncomment-func-decl ASN1_IA5STRING_free \
1921
--uncomment-func-decl ASN1_INTEGER_new \
2022
--uncomment-func-decl ASN1_INTEGER_free \
@@ -25,6 +27,8 @@ uncomment.sh "$1" --comment -h \
2527
--uncomment-func-decl ASN1_TIME_diff \
2628
--uncomment-func-decl ASN1_TIME_set \
2729
--uncomment-func-decl ASN1_TIME_adj \
30+
--uncomment-func-decl ASN1_TYPE_new \
31+
--uncomment-func-decl ASN1_TYPE_set \
2832
--uncomment-func-decl ASN1_OBJECT_free \
2933
--uncomment-func-decl ASN1_ENUMERATED_to_BN \
3034
--uncomment-func-decl i2d_ASN1_OCTET_STRING \

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ uncomment.sh "$1" --comment -h \
3737
--uncomment-typedef-redef ASN1_TIME \
3838
--uncomment-typedef-redef ASN1_ITEM \
3939
--uncomment-typedef-redef ASN1_OBJECT \
40+
--uncomment-typedef-redef ASN1_BMPSTRING \
4041
--uncomment-typedef-redef ASN1_IA5STRING \
42+
--uncomment-typedef-redef ASN1_UNIVERSALSTRING \
4143
--uncomment-typedef-redef ASN1_INTEGER \
4244
--uncomment-typedef-redef ASN1_OCTET_STRING \
4345
--uncomment-typedef-redef ASN1_STRING \

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ uncomment.sh "$1" --comment -h \
118118
--uncomment-regex 'DEFINE_STACK_OF(GENERAL_SUBTREE)' \
119119
--uncomment-macro-redef 'EXFLAG_[[:alnum:]_]*' \
120120
--uncomment-func-decl GENERAL_NAME_set0_value \
121+
--uncomment-func-decl GENERAL_NAME_set0_othername \
121122
--uncomment-func-decl X509_get_extension_flags \
122123
--uncomment-func-decl X509_get_key_usage \
123124
--uncomment-func-decl GENERAL_NAME_free \

0 commit comments

Comments
 (0)