Skip to content

x509attr: check for errors of sk_ASN1_TYPE_push() & use reserve call #1034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ndossche wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −3
Open

x509attr: check for errors of sk_ASN1_TYPE_push() & use reserve call #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ca0afb
x509attr: check for errors of sk_ASN1_TYPE_push()
ndossche Apr 19, 2026
0966d04
x509attr: use sk_ASN1_TYPE_new_reserve()
ndossche Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ext/openssl/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ def find_openssl_library
evp_h = "openssl/evp.h".freeze
ts_h = "openssl/ts.h".freeze
ssl_h = "openssl/ssl.h".freeze
stack_h = "openssl/stack.h".freeze

# compile options
have_func("RAND_egd()", "openssl/rand.h")
Expand All @@ -150,6 +151,9 @@ def find_openssl_library
# added in OpenSSL 1.1.1 and LibreSSL 3.5.0, then removed in LibreSSL 4.0.0
have_func("EVP_PKEY_check(NULL)", evp_h)

# added in OpenSSL 1.1.1, currently not in LibreSSL
have_func("OPENSSL_sk_new_reserve(NULL, 0)", stack_h)

# added in 3.0.0
have_func("SSL_CTX_set0_tmp_dh_pkey(NULL, NULL)", ssl_h)
have_func("ERR_get_error_all(NULL, NULL, NULL, NULL, NULL)", "openssl/err.h")
Expand Down
15 changes: 12 additions & 3 deletions ext/openssl/ossl_x509attr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,22 @@ ossl_x509attr_get_value(VALUE self)
unsigned char *p;

GetX509Attr(self, attr);
count = X509_ATTRIBUTE_count(attr);
/* there is no X509_ATTRIBUTE_get0_set() :( */
#ifdef HAVE_OPENSSL_SK_NEW_RESERVE
if (!(sk = sk_ASN1_TYPE_new_reserve(NULL, count)))
ossl_raise(eX509AttrError, "sk_new_reserve");
#else
if (!(sk = sk_ASN1_TYPE_new_null()))
ossl_raise(eX509AttrError, "sk_new");
#endif

count = X509_ATTRIBUTE_count(attr);
for (i = 0; i < count; i++)
sk_ASN1_TYPE_push(sk, (ASN1_TYPE *)X509_ATTRIBUTE_get0_type(attr, i));
for (i = 0; i < count; i++) {
if (!sk_ASN1_TYPE_push(sk, (ASN1_TYPE *)X509_ATTRIBUTE_get0_type(attr, i))) {
sk_ASN1_TYPE_free(sk);
ossl_raise(eX509AttrError, NULL);
}
}

if ((len = i2d_ASN1_SET_ANY(sk, NULL)) <= 0) {
sk_ASN1_TYPE_free(sk);
Expand Down