ruby: patch for openssl 1.0.0
This commit is contained in:
parent
dac1cfee28
commit
512c0f1732
|
|
@ -1,2 +1,3 @@
|
|||
5922459622a23612eb9b68a3586cb5f8 ruby-1.9.1-p378.tar.bz2
|
||||
47d04c87886689f454361249d255d823 ruby-arch.patch
|
||||
6067be7da0c6eb770e196a63b4ce9f26 ruby-openssl-1.0.patch
|
||||
|
|
|
|||
|
|
@ -5,14 +5,15 @@
|
|||
|
||||
name=ruby
|
||||
version=1.9.1-p378
|
||||
release=1
|
||||
release=2
|
||||
source=(ftp://ftp.ruby-lang.org/pub/$name/1.9/$name-$version.tar.bz2 \
|
||||
$name-arch.patch)
|
||||
$name-arch.patch $name-openssl-1.0.patch)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
|
||||
patch -p1 < $SRC/$name-arch.patch
|
||||
patch -p1 -i $SRC/$name-openssl-1.0.patch
|
||||
patch -p1 -i $SRC/$name-arch.patch
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
|
|
|
|||
178
ruby/ruby-openssl-1.0.patch
Normal file
178
ruby/ruby-openssl-1.0.patch
Normal file
|
|
@ -0,0 +1,178 @@
|
|||
# http://cvs.fedoraproject.org/viewvc/rpms/ruby/devel/ruby-openssl-1.0.patch?revision=1.3&view=markup
|
||||
|
||||
diff -Nru ruby-1.9.1-p378.orig/ext/openssl/ossl.c ruby-1.9.1-p378/ext/openssl/ossl.c
|
||||
--- ruby-1.9.1-p378.orig/ext/openssl/ossl.c 2010-06-01 12:01:47.322454029 +0200
|
||||
+++ ruby-1.9.1-p378/ext/openssl/ossl.c 2010-06-01 12:02:19.122453835 +0200
|
||||
@@ -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; \
|
||||
diff -Nru ruby-1.9.1-p378.orig/ext/openssl/ossl_pkcs7.c ruby-1.9.1-p378/ext/openssl/ossl_pkcs7.c
|
||||
--- ruby-1.9.1-p378.orig/ext/openssl/ossl_pkcs7.c 2010-06-01 12:01:47.322454029 +0200
|
||||
+++ ruby-1.9.1-p378/ext/openssl/ossl_pkcs7.c 2010-06-01 12:02:19.122453835 +0200
|
||||
@@ -572,12 +572,11 @@
|
||||
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;
|
||||
- STACK_OF(X509_CRL) *crls;
|
||||
int i;
|
||||
|
||||
GetPKCS7(self, pkcs7);
|
||||
@@ -585,17 +584,38 @@
|
||||
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;
|
||||
+ 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;
|
||||
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
|
||||
diff -Nru ruby-1.9.1-p378.orig/ext/openssl/ossl_ssl.c ruby-1.9.1-p378/ext/openssl/ossl_ssl.c
|
||||
--- ruby-1.9.1-p378.orig/ext/openssl/ossl_ssl.c 2010-06-01 12:01:47.322454029 +0200
|
||||
+++ ruby-1.9.1-p378/ext/openssl/ossl_ssl.c 2010-06-01 12:07:34.292453326 +0200
|
||||
@@ -88,12 +88,18 @@
|
||||
|
||||
ID ID_callback_state;
|
||||
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||
+#define OSSL_MORE_CONST const
|
||||
+#define STACK _STACK
|
||||
+#else
|
||||
+#define OSSL_MORE_CONST
|
||||
+#endif
|
||||
/*
|
||||
* SSLContext class
|
||||
*/
|
||||
struct {
|
||||
const char *name;
|
||||
- SSL_METHOD *(*func)(void);
|
||||
+ OSSL_MORE_CONST SSL_METHOD *(*func)(void);
|
||||
} ossl_ssl_method_tab[] = {
|
||||
#define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method }
|
||||
OSSL_SSL_METHOD_ENTRY(TLSv1),
|
||||
@@ -142,7 +148,7 @@
|
||||
static VALUE
|
||||
ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
|
||||
{
|
||||
- SSL_METHOD *method = NULL;
|
||||
+ OSSL_MORE_CONST SSL_METHOD *method = NULL;
|
||||
const char *s;
|
||||
int i;
|
||||
|
||||
@@ -585,7 +591,7 @@
|
||||
}
|
||||
|
||||
static VALUE
|
||||
-ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
|
||||
+ossl_ssl_cipher_to_ary(OSSL_MORE_CONST SSL_CIPHER *cipher)
|
||||
{
|
||||
VALUE ary;
|
||||
int bits, alg_bits;
|
||||
@@ -1213,7 +1219,7 @@
|
||||
ossl_ssl_get_cipher(VALUE self)
|
||||
{
|
||||
SSL *ssl;
|
||||
- SSL_CIPHER *cipher;
|
||||
+ OSSL_MORE_CONST SSL_CIPHER *cipher;
|
||||
|
||||
Data_Get_Struct(self, SSL, ssl);
|
||||
if (!ssl) {
|
||||
Loading…
Reference in New Issue
Block a user