Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 231019 Details for
Bug 304427
dev-lang/ruby fails to compile with openssl 1.0.0
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for ruby-1.8 from 1.8 branch
ruby-1.8.7-openssl1.patch (text/plain), 5.50 KB, created by
Maciej Mrozowski
on 2010-05-10 22:59:07 UTC
(
hide
)
Description:
Patch for ruby-1.8 from 1.8 branch
Filename:
MIME Type:
Creator:
Maciej Mrozowski
Created:
2010-05-10 22:59:07 UTC
Size:
5.50 KB
patch
obsolete
>Index: ext/openssl/ossl_x509attr.c >=================================================================== >--- ext/openssl/ossl_x509attr.c (revision 26837) >+++ ext/openssl/ossl_x509attr.c (revision 26838) >@@ -218,8 +218,9 @@ > ossl_str_adjust(str, p); > } > else{ >- length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL, >- i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0); >+ length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, >+ (unsigned char **) NULL, i2d_ASN1_TYPE, >+ V_ASN1_SET, V_ASN1_UNIVERSAL, 0); > str = rb_str_new(0, length); > p = (unsigned char *)RSTRING_PTR(str); > i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p, >Index: ext/openssl/ossl_ssl.c >=================================================================== >--- ext/openssl/ossl_ssl.c (revision 26837) >+++ ext/openssl/ossl_ssl.c (revision 26838) >@@ -1291,10 +1291,10 @@ > } > chain = SSL_get_peer_cert_chain(ssl); > if(!chain) return Qnil; >- num = sk_num(chain); >+ num = sk_X509_num(chain); > ary = rb_ary_new2(num); > 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)); > } > >Index: ext/openssl/ossl.c >=================================================================== >--- ext/openssl/ossl.c (revision 26837) >+++ ext/openssl/ossl.c (revision 26838) >@@ -92,7 +92,7 @@ > > #define OSSL_IMPL_SK2ARY(name, type) \ > VALUE \ >-ossl_##name##_sk2ary(STACK *sk) \ >+ossl_##name##_sk2ary(STACK_OF(type) *sk) \ > { \ > type *t; \ > int i, num; \ >@@ -102,7 +102,7 @@ > OSSL_Debug("empty sk!"); \ > return Qnil; \ > } \ >- num = sk_num(sk); \ >+ num = sk_##type##_num(sk); \ > if (num < 0) { \ > OSSL_Debug("items in sk < -1???"); \ > return rb_ary_new(); \ >@@ -110,7 +110,7 @@ > ary = rb_ary_new2(num); \ > \ > 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)); \ > } \ > return ary; \ >Index: ext/openssl/ossl.h >=================================================================== >--- ext/openssl/ossl.h (revision 26837) >+++ ext/openssl/ossl.h (revision 26838) >@@ -108,6 +108,13 @@ > } while (0) > > /* >+ * Compatibility >+ */ >+#if OPENSSL_VERSION_NUMBER >= 0x10000000L >+#define STACK _STACK >+#endif >+ >+/* > * String to HEXString conversion > */ > int string2hex(const unsigned char *, int, char **, int *); >Index: ext/openssl/ossl_x509crl.c >=================================================================== >--- ext/openssl/ossl_x509crl.c (revision 26837) >+++ ext/openssl/ossl_x509crl.c (revision 26838) >@@ -264,7 +264,7 @@ > VALUE ary, revoked; > > 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) { > OSSL_Debug("num < 0???"); > return rb_ary_new(); >@@ -272,7 +272,7 @@ > ary = rb_ary_new2(num); > for(i=0; i<num; i++) { > /* 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); > rb_ary_push(ary, revoked); > } >Index: ext/openssl/ossl_pkcs7.c >=================================================================== >--- ext/openssl/ossl_pkcs7.c (revision 26837) >+++ ext/openssl/ossl_pkcs7.c (revision 26838) >@@ -572,11 +572,33 @@ > return self; > } > >-static STACK * >-pkcs7_get_certs_or_crls(VALUE self, int want_certs) >+static STACK_OF(X509) * >+pkcs7_get_certs(VALUE self) > { > PKCS7 *pkcs7; > STACK_OF(X509) *certs; >+ int i; >+ >+ GetPKCS7(self, pkcs7); >+ i = OBJ_obj2nid(pkcs7->type); >+ switch(i){ >+ case NID_pkcs7_signed: >+ certs = pkcs7->d.sign->cert; >+ break; >+ case NID_pkcs7_signedAndEnveloped: >+ 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; > >@@ -584,18 +606,16 @@ > i = OBJ_obj2nid(pkcs7->type); > switch(i){ > case NID_pkcs7_signed: >- certs = pkcs7->d.sign->cert; > crls = pkcs7->d.sign->crl; > break; > case NID_pkcs7_signedAndEnveloped: >- certs = pkcs7->d.signed_and_enveloped->cert; > crls = pkcs7->d.signed_and_enveloped->crl; > break; > default: >- certs = crls = NULL; >+ crls = NULL; > } > >- return want_certs ? certs : crls; >+ return crls; > } > > static VALUE >@@ -610,7 +630,7 @@ > STACK_OF(X509) *certs; > X509 *cert; > >- certs = pkcs7_get_certs_or_crls(self, 1); >+ certs = pkcs7_get_certs(self); > while((cert = sk_X509_pop(certs))) X509_free(cert); > rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self); > >@@ -620,7 +640,7 @@ > static VALUE > 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 >@@ -650,7 +670,7 @@ > STACK_OF(X509_CRL) *crls; > 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); > rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self); > >@@ -660,7 +680,7 @@ > static VALUE > 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 304427
: 231019 |
235805
|
235815