Skip to content

fix: unchecked *_set_* calls #1044

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 1 commit into
base: master
Choose a base branch
from
+25 −8
Open

fix: unchecked *_set_* calls #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions ext/openssl/ossl_ssl_session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ static VALUE ossl_ssl_session_set_time(VALUE self, VALUE time_v)
time_v = rb_funcall(time_v, rb_intern("to_i"), 0);
}
t = NUM2LONG(time_v);
SSL_SESSION_set_time(ctx, t);
if (SSL_SESSION_set_time(ctx, t) != t) {
ossl_raise(eSSLSession, "SSL_SESSION_set_time");
}
return ossl_ssl_session_get_time(self);
}

Expand All @@ -200,7 +202,9 @@ static VALUE ossl_ssl_session_set_timeout(VALUE self, VALUE time_v)

GetSSLSession(self, ctx);
t = NUM2LONG(time_v);
SSL_SESSION_set_timeout(ctx, t);
if (SSL_SESSION_set_timeout(ctx, t) != 1) {
ossl_raise(eSSLSession, "SSL_SESSION_set_timeout");
}
return ossl_ssl_session_get_timeout(self);
}

Expand Down
9 changes: 7 additions & 2 deletions ext/openssl/ossl_ts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,9 @@ ossl_ts_req_set_cert_requested(VALUE self, VALUE requested)
TS_REQ *req;

GetTSRequest(self, req);
TS_REQ_set_cert_req(req, RTEST(requested));
if (!TS_REQ_set_cert_req(req, RTEST(requested))) {
ossl_raise(eTimestampError, "TS_REQ_set_cert_req");
}

return requested;
}
Expand Down Expand Up @@ -1233,7 +1235,10 @@ ossl_tsfac_create_ts(VALUE self, VALUE key, VALUE certificate, VALUE request)
sk_X509_pop_free(inter_certs, X509_free);
}

TS_RESP_CTX_set_signer_key(ctx, sign_key);
if (!TS_RESP_CTX_set_signer_key(ctx, sign_key)) {
err_msg = "Signer key could not be set";
goto end;
}
if (!NIL_P(def_policy_id) && !TS_REQ_get_policy_id(req))
TS_RESP_CTX_set_def_policy(ctx, def_policy_id_obj);
if (TS_REQ_get_policy_id(req))
Expand Down
4 changes: 3 additions & 1 deletion ext/openssl/ossl_x509ext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,9 @@ ossl_x509ext_set_critical(VALUE self, VALUE flag)
X509_EXTENSION *ext;

GetX509Ext(self, ext);
X509_EXTENSION_set_critical(ext, RTEST(flag) ? 1 : 0);
if (!X509_EXTENSION_set_critical(ext, RTEST(flag) ? 1 : 0)) {
ossl_raise(eX509ExtError, "X509_EXTENSION_set_critical");
}

return flag;
}
Expand Down
12 changes: 9 additions & 3 deletions ext/openssl/ossl_x509store.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,9 @@ ossl_x509store_set_flags(VALUE self, VALUE flags)
long f = NUM2LONG(flags);

GetX509Store(self, store);
X509_STORE_set_flags(store, f);
if (!X509_STORE_set_flags(store, f)) {
ossl_raise(eX509StoreError, "X509_STORE_set_flags");
}

return flags;
}
Expand Down Expand Up @@ -281,7 +283,9 @@ ossl_x509store_set_purpose(VALUE self, VALUE purpose)
int p = NUM2INT(purpose);

GetX509Store(self, store);
X509_STORE_set_purpose(store, p);
if (!X509_STORE_set_purpose(store, p)) {
ossl_raise(eX509StoreError, "X509_STORE_set_purpose");
}

return purpose;
}
Expand All @@ -305,7 +309,9 @@ ossl_x509store_set_trust(VALUE self, VALUE trust)
int t = NUM2INT(trust);

GetX509Store(self, store);
X509_STORE_set_trust(store, t);
if (!X509_STORE_set_trust(store, t)) {
ossl_raise(eX509StoreError, "X509_STORE_set_trust");
}

return trust;
}
Expand Down