1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* openssl/ossl.c (OSSL_IMPL_SK2ARY): for OpenSSL 1.0.

Browse Source 
patched by Jeroen van Meeuwen at [ruby-core:25210]
  fixed by Nobuyoshi Nakada [ruby-core:25238],
  Hongli Lai [ruby-core:27417],
  and Motohiro KOSAKI [ruby-core:28063]

* ext/openssl/ossl_ssl.c (ossl_ssl_method_tab),
  (ossl_ssl_cipher_to_ary): constified.

* ext/openssl/ossl_pkcs7.c (pkcs7_get_certs, pkcs7_get_crls):
  split pkcs7_get_certs_or_crls.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-02-28 02:56:26 +00:00
parent 663a7488ce
commit 48e861ddfb
7 changed files with 61 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
Sun Feb 28 11:49:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
* openssl/ossl.c (OSSL_IMPL_SK2ARY): for OpenSSL 1.0.
patched by Jeroen van Meeuwen at [ruby-core:25210]
fixed by Nobuyoshi Nakada [ruby-core:25238],
Hongli Lai [ruby-core:27417],
and Motohiro KOSAKI [ruby-core:28063]
* ext/openssl/ossl_ssl.c (ossl_ssl_method_tab),
(ossl_ssl_cipher_to_ary): constified.
* ext/openssl/ossl_pkcs7.c (pkcs7_get_certs, pkcs7_get_crls):
split pkcs7_get_certs_or_crls.
Sun Feb 28 11:42:55 2010 NARUSE, Yui <naruse@ruby-lang.org> Sun Feb 28 11:42:55 2010 NARUSE, Yui <naruse@ruby-lang.org>
* test/openssl/{test_x509cert.rb,openssl,test_x509crl.rb, * test/openssl/{test_x509cert.rb,openssl,test_x509crl.rb,

6
ext/openssl/ossl.c
View File

@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary)
#define OSSL_IMPL_SK2ARY(name, type) \ #define OSSL_IMPL_SK2ARY(name, type) \
VALUE \ VALUE \
ossl_##name##_sk2ary(STACK *sk) \ ossl_##name##_sk2ary(STACK_OF(type) *sk) \
{ \ { \
type *t; \ type *t; \
int i, num; \ int i, num; \
@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk) \
OSSL_Debug("empty sk!"); \ OSSL_Debug("empty sk!"); \
return Qnil; \ return Qnil; \
} \ } \
num = sk_num(sk); \ num = sk_##type##_num(sk); \
if (num < 0) { \ if (num < 0) { \
OSSL_Debug("items in sk < -1???"); \ OSSL_Debug("items in sk < -1???"); \
return rb_ary_new(); \ return rb_ary_new(); \
@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk) \
ary = rb_ary_new2(num); \ ary = rb_ary_new2(num); \
\ \
for (i=0; i<num; i++) { \ for (i=0; i<num; i++) { \
t = (type *)sk_value(sk, i); \ t = sk_##type##_value(sk, i); \
rb_ary_push(ary, ossl_##name##_new(t)); \ rb_ary_push(ary, ossl_##name##_new(t)); \
} \ } \
return ary; \ return ary; \

7
ext/openssl/ossl.h
View File

@ -103,6 +103,13 @@ extern VALUE eOSSLError;
}\ }\
} while (0) } while (0)
/*
* Compatibility
*/
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
#define STACK _STACK
#endif
/* /*
* String to HEXString conversion * String to HEXString conversion
*/ */

40
ext/openssl/ossl_pkcs7.c
View File

@ -572,12 +572,11 @@ ossl_pkcs7_add_certificate(VALUE self, VALUE cert)
return self; return self;
} }
static STACK * static STACK_OF(X509) *
pkcs7_get_certs_or_crls(VALUE self, int want_certs) pkcs7_get_certs(VALUE self)
{ {
PKCS7 *pkcs7; PKCS7 *pkcs7;
STACK_OF(X509) *certs; STACK_OF(X509) *certs;
STACK_OF(X509_CRL) *crls;
int i; int i;
GetPKCS7(self, pkcs7); GetPKCS7(self, pkcs7);
@ -585,17 +584,38 @@ pkcs7_get_certs_or_crls(VALUE self, int want_certs)
switch(i){ switch(i){
case NID_pkcs7_signed: case NID_pkcs7_signed:
certs = pkcs7->d.sign->cert; certs = pkcs7->d.sign->cert;
crls = pkcs7->d.sign->crl;
break; break;
case NID_pkcs7_signedAndEnveloped: case NID_pkcs7_signedAndEnveloped:
certs = pkcs7->d.signed_and_enveloped->cert; certs = pkcs7->d.signed_and_enveloped->cert;
break;
default:
certs = NULL;
}
return certs;
}
static STACK_OF(X509_CRL) *
pkcs7_get_crls(VALUE self)
{
PKCS7 *pkcs7;
STACK_OF(X509_CRL) *crls;
int i;
GetPKCS7(self, pkcs7);
i = OBJ_obj2nid(pkcs7->type);
switch(i){
case NID_pkcs7_signed:
crls = pkcs7->d.sign->crl;
break;
case NID_pkcs7_signedAndEnveloped:
crls = pkcs7->d.signed_and_enveloped->crl; crls = pkcs7->d.signed_and_enveloped->crl;
break; break;
default: default:
certs = crls = NULL; crls = NULL;
} }
return want_certs ? certs : crls; return crls;
} }
static VALUE static VALUE
@ -610,7 +630,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
STACK_OF(X509) *certs; STACK_OF(X509) *certs;
X509 *cert; X509 *cert;
certs = pkcs7_get_certs_or_crls(self, 1); certs = pkcs7_get_certs(self);
while((cert = sk_X509_pop(certs))) X509_free(cert); while((cert = sk_X509_pop(certs))) X509_free(cert);
rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self); rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self);
@ -620,7 +640,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
static VALUE static VALUE
ossl_pkcs7_get_certificates(VALUE self) ossl_pkcs7_get_certificates(VALUE self)
{ {
return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1)); return ossl_x509_sk2ary(pkcs7_get_certs(self));
} }
static VALUE static VALUE
@ -650,7 +670,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary)
STACK_OF(X509_CRL) *crls; STACK_OF(X509_CRL) *crls;
X509_CRL *crl; X509_CRL *crl;
crls = pkcs7_get_certs_or_crls(self, 0); crls = pkcs7_get_crls(self);
while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl); while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl);
rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self); rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self);
@ -660,7 +680,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary)
static VALUE static VALUE
ossl_pkcs7_get_crls(VALUE self) ossl_pkcs7_get_crls(VALUE self)
{ {
return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0)); return ossl_x509crl_sk2ary(pkcs7_get_crls(self));
} }
static VALUE static VALUE

4
ext/openssl/ossl_ssl.c
View File

@ -1403,10 +1403,10 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
} }
chain = SSL_get_peer_cert_chain(ssl); chain = SSL_get_peer_cert_chain(ssl);
if(!chain) return Qnil; if(!chain) return Qnil;
num = sk_num(chain); num = sk_X509_num(chain);
ary = rb_ary_new2(num); ary = rb_ary_new2(num);
for (i = 0; i < num; i++){ for (i = 0; i < num; i++){
cert = (X509*)sk_value(chain, i); cert = sk_X509_value(chain, i);
rb_ary_push(ary, ossl_x509_new(cert)); rb_ary_push(ary, ossl_x509_new(cert));
} }

5
ext/openssl/ossl_x509attr.c
View File

@ -218,8 +218,9 @@ ossl_x509attr_get_value(VALUE self)
ossl_str_adjust(str, p); ossl_str_adjust(str, p);
} }
else{ else{
length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL, length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set,
i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0); (unsigned char **) NULL, i2d_ASN1_TYPE,
V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
str = rb_str_new(0, length); str = rb_str_new(0, length);
p = (unsigned char *)RSTRING_PTR(str); p = (unsigned char *)RSTRING_PTR(str);
i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p, i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p,

4
ext/openssl/ossl_x509crl.c
View File

@ -264,7 +264,7 @@ ossl_x509crl_get_revoked(VALUE self)
VALUE ary, revoked; VALUE ary, revoked;
GetX509CRL(self, crl); GetX509CRL(self, crl);
num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl)); num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl));
if (num < 0) { if (num < 0) {
OSSL_Debug("num < 0???"); OSSL_Debug("num < 0???");
return rb_ary_new(); return rb_ary_new();
@ -272,7 +272,7 @@ ossl_x509crl_get_revoked(VALUE self)
ary = rb_ary_new2(num); ary = rb_ary_new2(num);
for(i=0; i<num; i++) { for(i=0; i<num; i++) {
/* NO DUP - don't free! */ /* NO DUP - don't free! */
rev = (X509_REVOKED *)sk_X509_CRL_value(X509_CRL_get_REVOKED(crl), i); rev = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
revoked = ossl_x509revoked_new(rev); revoked = ossl_x509revoked_new(rev);
rb_ary_push(ary, revoked); rb_ary_push(ary, revoked);
} }