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_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):

Browse source 
workaround for the versions earlier than OpenSSL-0.9.7.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6399 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
gotoyuzo 2004-05-24 16:50:59 +00:00
parent 614537d5fa
commit 3216cb5839
2 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue May 25 01:50:17 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):
workaround for the versions earlier than OpenSSL-0.9.7.
Mon May 24 10:46:26 2004 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> Mon May 24 10:46:26 2004 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* lib/rdoc/generators/template/html/html.rb: SYSTEM identifiers * lib/rdoc/generators/template/html/html.rb: SYSTEM identifiers

40
ext/openssl/ossl_asn1.c
View file

@ -189,7 +189,7 @@ static ID sUNIVERSAL, sAPPLICATION, sCONTEXT_SPECIFIC, sPRIVATE;
static ASN1_BOOLEAN static ASN1_BOOLEAN
obj_to_asn1bool(VALUE obj) obj_to_asn1bool(VALUE obj)
{ {
return RTEST(obj) ? 255 : 0; return RTEST(obj) ? 0xff : 0x100;
} }
static ASN1_INTEGER* static ASN1_INTEGER*
@ -886,6 +886,30 @@ ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
return self; return self;
} }
static int
ossl_i2d_ASN1_TYPE(ASN1_TYPE *a, unsigned char **pp)
{
#if OPENSSL_VERSION_NUMBER < 0x00907000L
if(!a) return 0;
if(a->type == V_ASN1_BOOLEAN)
return i2d_ASN1_BOOLEAN(a->value.boolean, pp);
#endif
return i2d_ASN1_TYPE(a, pp);
}
static void
ossl_ASN1_TYPE_free(ASN1_TYPE *a)
{
#if OPENSSL_VERSION_NUMBER < 0x00907000L
if(!a) return;
if(a->type == V_ASN1_BOOLEAN){
OPENSSL_free(a);
return;
}
#endif
ASN1_TYPE_free(a);
}
static VALUE static VALUE
ossl_asn1prim_to_der(VALUE self) ossl_asn1prim_to_der(VALUE self)
{ {
@ -900,24 +924,24 @@ ossl_asn1prim_to_der(VALUE self)
explicit = ossl_asn1_is_explicit(self); explicit = ossl_asn1_is_explicit(self);
asn1 = ossl_asn1_get_asn1type(self); asn1 = ossl_asn1_get_asn1type(self);
length = ASN1_object_size(1, i2d_ASN1_TYPE(asn1, NULL), tn); length = ASN1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
if(!(buf = OPENSSL_malloc(length))){ if(!(buf = OPENSSL_malloc(length))){
ASN1_TYPE_free(asn1); ossl_ASN1_TYPE_free(asn1);
ossl_raise(eASN1Error, "cannot alloc buffer"); ossl_raise(eASN1Error, "cannot alloc buffer");
} }
p = buf; p = buf;
if(tc == V_ASN1_UNIVERSAL) i2d_ASN1_TYPE(asn1, &p); if(tc == V_ASN1_UNIVERSAL) ossl_i2d_ASN1_TYPE(asn1, &p);
else{ else{
if(explicit){ if(explicit){
ASN1_put_object(&p, 1, i2d_ASN1_TYPE(asn1, NULL), tn, tc); ASN1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
i2d_ASN1_TYPE(asn1, &p); ossl_i2d_ASN1_TYPE(asn1, &p);
} }
else{ else{
i2d_ASN1_TYPE(asn1, &p); ossl_i2d_ASN1_TYPE(asn1, &p);
*buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED); *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
} }
} }
ASN1_TYPE_free(asn1); ossl_ASN1_TYPE_free(asn1);
reallen = p - buf; reallen = p - buf;
assert(reallen <= length); assert(reallen <= length);
str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */ str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */