Skip to content

ts: refactor decoding DER #1045

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
rhenium wants to merge 2 commits into
base: master
Choose a base branch
from
+29 −23
Open

ts: refactor decoding DER #1045

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
d38a572
ts: do not use the "reuse" behavior of d2i_*{,_bio}() functions
rhenium Apr 29, 2026
0b7debd
pkcs12: add missing error check for d2i_PKCS12_bio()
rhenium Apr 29, 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
11 changes: 7 additions & 4 deletions ext/openssl/ossl_pkcs12.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,24 +191,27 @@ ossl_x509_sk2ary_i(VALUE arg)
static VALUE
ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
{
PKCS12 *p12, *p12_orig = DATA_PTR(self);
BIO *in;
VALUE arg, pass, pkey, cert, ca;
char *passphrase;
EVP_PKEY *key;
X509 *x509;
STACK_OF(X509) *x509s = NULL;
int st = 0;
PKCS12 *pkcs = DATA_PTR(self);

if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self;
passphrase = NIL_P(pass) ? NULL : StringValueCStr(pass);
in = ossl_obj2bio(&arg);
d2i_PKCS12_bio(in, &pkcs);
DATA_PTR(self) = pkcs;
p12 = d2i_PKCS12_bio(in, NULL);
BIO_free(in);
if (!p12)
ossl_raise(ePKCS12Error, "d2i_PKCS12_bio");
PKCS12_free(p12_orig);
RTYPEDDATA_DATA(self) = p12;

pkey = cert = ca = Qnil;
if(!PKCS12_parse(pkcs, passphrase, &key, &x509, &x509s))
if (!PKCS12_parse(p12, passphrase, &key, &x509, &x509s))
ossl_raise(ePKCS12Error, "PKCS12_parse");
if (key) {
pkey = rb_protect(ossl_pkey_wrap_i, (VALUE)key, &st);
Expand Down
41 changes: 22 additions & 19 deletions ext/openssl/ossl_ts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ ossl_ts_req_alloc(VALUE klass)
static VALUE
ossl_ts_req_initialize(int argc, VALUE *argv, VALUE self)
{
TS_REQ *ts_req = DATA_PTR(self);
TS_REQ *req, *req_orig = DATA_PTR(self);
BIO *in;
VALUE arg;

Expand All @@ -178,13 +178,14 @@ ossl_ts_req_initialize(int argc, VALUE *argv, VALUE self)

arg = ossl_to_der_if_possible(arg);
in = ossl_obj2bio(&arg);
ts_req = d2i_TS_REQ_bio(in, &ts_req);
req = d2i_TS_REQ_bio(in, NULL);
BIO_free(in);
if (!ts_req) {
DATA_PTR(self) = NULL;
ossl_raise(eTimestampError, "Error when decoding the timestamp request");
if (!req) {
ossl_raise(eTimestampError,
"Error when decoding the timestamp request");
}
DATA_PTR(self) = ts_req;
TS_REQ_free(req_orig);
RTYPEDDATA_DATA(self) = req;

return self;
}
Expand Down Expand Up @@ -522,18 +523,19 @@ ossl_ts_resp_alloc(VALUE klass)
static VALUE
ossl_ts_resp_initialize(VALUE self, VALUE der)
{
TS_RESP *ts_resp = DATA_PTR(self);
TS_RESP *resp, *resp_orig = DATA_PTR(self);
BIO *in;

der = ossl_to_der_if_possible(der);
in = ossl_obj2bio(&der);
ts_resp = d2i_TS_RESP_bio(in, &ts_resp);
in = ossl_obj2bio(&der);
resp = d2i_TS_RESP_bio(in, NULL);
BIO_free(in);
if (!ts_resp) {
DATA_PTR(self) = NULL;
ossl_raise(eTimestampError, "Error when decoding the timestamp response");
if (!resp) {
ossl_raise(eTimestampError,
"Error when decoding the timestamp response");
}
DATA_PTR(self) = ts_resp;
TS_RESP_free(resp_orig);
RTYPEDDATA_DATA(self) = resp;

return self;
}
Expand Down Expand Up @@ -876,18 +878,19 @@ ossl_ts_token_info_alloc(VALUE klass)
static VALUE
ossl_ts_token_info_initialize(VALUE self, VALUE der)
{
TS_TST_INFO *info = DATA_PTR(self);
TS_TST_INFO *info, *info_orig = DATA_PTR(self);
BIO *in;

der = ossl_to_der_if_possible(der);
in = ossl_obj2bio(&der);
info = d2i_TS_TST_INFO_bio(in, &info);
in = ossl_obj2bio(&der);
info = d2i_TS_TST_INFO_bio(in, NULL);
BIO_free(in);
if (!info) {
DATA_PTR(self) = NULL;
ossl_raise(eTimestampError, "Error when decoding the timestamp token info");
ossl_raise(eTimestampError,
"Error when decoding the timestamp token info");
}
DATA_PTR(self) = info;
TS_TST_INFO_free(info_orig);
RTYPEDDATA_DATA(self) = info;

return self;
}
Expand Down