mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
import OpenSSL from trunk
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12496 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f5be4ddc8d
commit
18342ff8e0
48 changed files with 3828 additions and 365 deletions
|
@ -62,9 +62,9 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
|
|||
return self;
|
||||
}
|
||||
StringValue(buffer);
|
||||
if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING(buffer)->ptr, -1))) {
|
||||
p = RSTRING(buffer)->ptr;
|
||||
if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING(buffer)->len))) {
|
||||
if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING_PTR(buffer), -1))) {
|
||||
p = RSTRING_PTR(buffer);
|
||||
if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING_LEN(buffer)))) {
|
||||
ossl_raise(eSPKIError, NULL);
|
||||
}
|
||||
}
|
||||
|
@ -87,7 +87,7 @@ ossl_spki_to_der(VALUE self)
|
|||
if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0)
|
||||
ossl_raise(eX509CertError, NULL);
|
||||
str = rb_str_new(0, len);
|
||||
p = RSTRING(str)->ptr;
|
||||
p = RSTRING_PTR(str);
|
||||
if (i2d_NETSCAPE_SPKI(spki, &p) <= 0)
|
||||
ossl_raise(eX509CertError, NULL);
|
||||
ossl_str_adjust(str, p);
|
||||
|
@ -183,8 +183,8 @@ ossl_spki_set_challenge(VALUE self, VALUE str)
|
|||
|
||||
StringValue(str);
|
||||
GetSPKI(self, spki);
|
||||
if (!ASN1_STRING_set(spki->spkac->challenge, RSTRING(str)->ptr,
|
||||
RSTRING(str)->len)) {
|
||||
if (!ASN1_STRING_set(spki->spkac->challenge, RSTRING_PTR(str),
|
||||
RSTRING_LEN(str))) {
|
||||
ossl_raise(eSPKIError, NULL);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue