Skip to content

feat: X509.new now takes a keyword arguments #938

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: X509.new now takes a keyword arguments #938

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
40 changes: 36 additions & 4 deletions ext/openssl/ossl_x509cert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,51 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
BIO *in;
X509 *x509, *x509_orig = RTYPEDDATA_DATA(self);
VALUE arg;
VALUE kwargs;
const char *propq = NULL;

rb_check_frozen(self);
if (rb_scan_args(argc, argv, "01", &arg) == 0) {

if (rb_scan_args(argc, argv, "01:", &arg, &kwargs) == 0) {
/* create just empty X509Cert */
return self;
}
ID table[2];
table[0] = rb_intern("der");
table[1] = rb_intern("propq");
Comment on lines +124 to +126
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

X509.new(string, der: another_string) is ambiguous and I don't think a keyword argument for the input is very useful. I'd prefer to allow just propq this time.

Also, because we now use C99, we can simplify it:

ID table[] = { rb_intern("propq") };


VALUE values[2];
rb_get_kwargs(kwargs, table, 0, 2, values);

#ifdef OSSL_USE_PROVIDER
if(values[1] != Qundef) {
propq = (char *)RSTRING_PTR(values[1]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
propq = (char *)RSTRING_PTR(values[1]);
propq = StringValueCStr(values[1]);

We have to check that the argument is actually a String object and that the content is NUL-terminated.

}

x509 = X509_new_ex(/*libctx*/NULL, propq);
#else
x509 = X509_new();
#endif
if (!x509) ossl_raise(eX509CertError, NULL);

if(arg == Qundef && values[0] != Qundef) {
arg = values[0];
}

if(arg == Qundef) {
return self;
}

/* something to read in */
arg = ossl_to_der_if_possible(arg);
in = ossl_obj2bio(&arg);
x509 = d2i_X509_bio(in, NULL);
x509 = d2i_X509_bio(in, &x509);

if (!x509) {
OSSL_BIO_reset(in);
x509 = PEM_read_bio_X509(in, NULL, NULL, NULL);
OSSL_BIO_reset(in);
x509 = PEM_read_bio_X509(in, &x509, NULL, NULL);
}

BIO_free(in);
if (!x509)
ossl_raise(eX509CertError, "PEM_read_bio_X509");
Expand Down
Loading