Skip to content
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

Fix test_create_with_mac_iter accidently setting keytype not maciter #762

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Fix test_create_with_mac_iter accidently setting keytype not maciter #762

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: 8 additions & 0 deletions ext/openssl/ossl_pkcs12.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
if (!NIL_P(keytype))
ktype = NUM2INT(keytype);

if (ktype != 0 && ktype != KEY_SIG && ktype != KEY_EX) {
ossl_raise(rb_eArgError, "Unknown key usage type %"PRIsVALUE, INT2NUM(ktype));
}

obj = NewPKCS12(cPKCS12);
x509s = NIL_P(ca) ? NULL : ossl_x509_ary2sk(ca);
p12 = PKCS12_create(passphrase, friendlyname, key, x509, x509s,
Expand Down Expand Up @@ -272,4 +276,8 @@ Init_ossl_pkcs12(void)
rb_attr(cPKCS12, rb_intern("ca_certs"), 1, 0, Qfalse);
rb_define_method(cPKCS12, "initialize", ossl_pkcs12_initialize, -1);
rb_define_method(cPKCS12, "to_der", ossl_pkcs12_to_der, 0);

/* MSIE specific PKCS12 key usage extensions */
rb_define_const(cPKCS12, "KEY_EX", INT2NUM(KEY_EX));
rb_define_const(cPKCS12, "KEY_SIG", INT2NUM(KEY_SIG));
}
31 changes: 30 additions & 1 deletion test/openssl/test_pkcs12.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ def test_create_with_mac_itr
DEFAULT_PBE_PKEYS,
DEFAULT_PBE_CERTS,
nil,
nil,
2048
)

Expand All @@ -178,6 +177,36 @@ def test_create_with_mac_itr
end
end

def test_create_with_keytype
OpenSSL::PKCS12.create(
"omg",
"hello",
@mykey,
@mycert,
[],
DEFAULT_PBE_PKEYS,
DEFAULT_PBE_CERTS,
nil,
nil,
OpenSSL::PKCS12::KEY_SIG
)

assert_raise(ArgumentError) do
OpenSSL::PKCS12.create(
"omg",
"hello",
@mykey,
@mycert,
[],
DEFAULT_PBE_PKEYS,
DEFAULT_PBE_CERTS,
nil,
nil,
2048
)
end
end

def test_new_with_no_keys
# generated with:
# openssl pkcs12 -certpbe PBE-SHA1-3DES -in <@mycert> -nokeys -export
Expand Down