diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-09 16:20:22 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-09 16:20:22 +0000 |
| commit | 80549d5f17e09173251204f08d288a71bad39256 (patch) | |
| tree | 8dbfe93b8b90f5cb9cf60050ba91ea3351359bfa /ext/openssl/ossl_x509name.c | |
| parent | 67a98cd52f380857d3aea57cfb26dde38bdbaa97 (diff) | |
* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): add
optional argument to specify the DirectoryString type
(ASN1::UTF8STRING by default). RFC3280 deprecates PrintableString
for DirectoryString, and strongly requires to use UTF8String for
all certificates issued after December, 31 2003.
* ext/openssl/lib/openssl/x509.rb (X509::Name::parse): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl_x509name.c')
| -rw-r--r-- | ext/openssl/ossl_x509name.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c index 4f895f0cfd..5964eec2ee 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -9,7 +9,6 @@ * (See the file 'LICENCE'.) */ #include "ossl.h" -#include "st.h" /* For st_foreach -- ST_CONTINUE */ #define WrapX509Name(klass, obj, name) do { \ if (!name) { \ @@ -88,13 +87,13 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self) { X509_NAME *name; int i, type; - VALUE arg, item, key, value; + VALUE arg, str_type, item, key, value; GetX509Name(self, name); - if (rb_scan_args(argc, argv, "01", &arg) == 0) { + if (rb_scan_args(argc, argv, "02", &arg, &str_type) == 0) { return self; } - if (rb_respond_to(arg, ossl_s_to_der)){ + if (argc == 1 && rb_respond_to(arg, ossl_s_to_der)){ unsigned char *p; VALUE str = rb_funcall(arg, ossl_s_to_der, 0); StringValue(str); @@ -104,6 +103,7 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self) return self; } Check_Type(arg, T_ARRAY); + type = NIL_P(str_type) ? V_ASN1_UTF8STRING : NUM2INT(str_type); for (i=0; i<RARRAY(arg)->len; i++) { item = RARRAY(arg)->ptr[i]; Check_Type(item, T_ARRAY); @@ -114,7 +114,6 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self) value = RARRAY(item)->ptr[1]; StringValue(key); StringValue(value); - type = ASN1_PRINTABLE_type(RSTRING(value)->ptr, -1); if (!X509_NAME_add_entry_by_txt(name, RSTRING(key)->ptr, type, RSTRING(value)->ptr, RSTRING(value)->len, -1, 0)) { ossl_raise(eX509NameError, NULL); |