kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): the argument

Browse source 
should be a String.

* ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): ditt.

* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): ditto.

* ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.

* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
gotoyuzo 2003-09-20 19:18:22 +00:00
parent 879944aa32
commit ca8be43f0e
4 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
Sun Sep 21 04:12:36 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): the argument
should be a String.
* ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): ditt.
* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): ditto.
* ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
Mon Sep 20 11:49:05 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org> Mon Sep 20 11:49:05 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/logger.rb: typo fixed. * lib/logger.rb: typo fixed.

2
ext/openssl/ossl_ocsp.c
View file

@ -108,6 +108,7 @@ ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
rb_scan_args(argc, argv, "01", &arg); rb_scan_args(argc, argv, "01", &arg);
if(!NIL_P(arg)){ if(!NIL_P(arg)){
arg = ossl_to_der_if_possible(arg); arg = ossl_to_der_if_possible(arg);
StringValue(arg);
p = (unsigned char*)RSTRING(arg)->ptr; p = (unsigned char*)RSTRING(arg)->ptr;
if(!d2i_OCSP_REQUEST((OCSP_REQUEST**)&DATA_PTR(self), &p, if(!d2i_OCSP_REQUEST((OCSP_REQUEST**)&DATA_PTR(self), &p,
RSTRING(arg)->len)){ RSTRING(arg)->len)){
@ -312,6 +313,7 @@ ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self)
rb_scan_args(argc, argv, "01", &arg); rb_scan_args(argc, argv, "01", &arg);
if(!NIL_P(arg)){ if(!NIL_P(arg)){
arg = ossl_to_der_if_possible(arg); arg = ossl_to_der_if_possible(arg);
StringValue(arg);
p = RSTRING(arg)->ptr; p = RSTRING(arg)->ptr;
if(!d2i_OCSP_RESPONSE((OCSP_RESPONSE**)&DATA_PTR(self), &p, if(!d2i_OCSP_RESPONSE((OCSP_RESPONSE**)&DATA_PTR(self), &p,
RSTRING(arg)->len)){ RSTRING(arg)->len)){

1
ext/openssl/ossl_x509attr.c
View file

@ -94,6 +94,7 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){ if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
GetX509Attr(self, attr); GetX509Attr(self, attr);
oid = ossl_to_der_if_possible(oid); oid = ossl_to_der_if_possible(oid);
StringValue(oid);
p = RSTRING(oid)->ptr; p = RSTRING(oid)->ptr;
if(!d2i_X509_ATTRIBUTE(&attr, &p, RSTRING(oid)->len)){ if(!d2i_X509_ATTRIBUTE(&attr, &p, RSTRING(oid)->len)){
ossl_raise(eX509AttrError, NULL); ossl_raise(eX509AttrError, NULL);

2
ext/openssl/ossl_x509ext.c
View file

@ -256,6 +256,7 @@ ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){ if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){
/* evaluate oid as a DER string */ /* evaluate oid as a DER string */
oid = ossl_to_der_if_possible(oid); oid = ossl_to_der_if_possible(oid);
StringValue(oid);
GetX509Ext(self, ext); GetX509Ext(self, ext);
p = RSTRING(oid)->ptr; p = RSTRING(oid)->ptr;
if(!d2i_X509_EXTENSION(&ext, &p, RSTRING(oid)->len)) if(!d2i_X509_EXTENSION(&ext, &p, RSTRING(oid)->len))
@ -295,6 +296,7 @@ ossl_x509ext_set_value(VALUE self, VALUE data)
GetX509Ext(self, ext); GetX509Ext(self, ext);
data = ossl_to_der_if_possible(data); data = ossl_to_der_if_possible(data);
StringValue(data);
if(!(s = OPENSSL_malloc(RSTRING(data)->len))) if(!(s = OPENSSL_malloc(RSTRING(data)->len)))
ossl_raise(eX509ExtError, "malloc error"); ossl_raise(eX509ExtError, "malloc error");
memcpy(s, RSTRING(data)->ptr, RSTRING(data)->len); memcpy(s, RSTRING(data)->ptr, RSTRING(data)->len);