177 lines
5.3 KiB
Diff
177 lines
5.3 KiB
Diff
diff -up ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c.ossl10 ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c
|
|
--- ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c.ossl10 2007-02-13 00:01:19.000000000 +0100
|
|
+++ ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl.c 2009-08-26 12:29:41.000000000 +0200
|
|
@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary)
|
|
|
|
#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_##name##_sk2ary(STACK *sk) \
|
|
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 @@ ossl_##name##_sk2ary(STACK *sk) \
|
|
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 -up ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_pkcs7.c.ossl10 ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_pkcs7.c
|
|
--- ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_pkcs7.c.ossl10 2007-02-13 00:01:19.000000000 +0100
|
|
+++ ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_pkcs7.c 2009-08-26 12:53:05.000000000 +0200
|
|
@@ -543,12 +543,11 @@ ossl_pkcs7_add_certificate(VALUE self, V
|
|
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);
|
|
@@ -556,17 +555,38 @@ pkcs7_get_certs_or_crls(VALUE self, int
|
|
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
|
|
@@ -581,7 +601,7 @@ ossl_pkcs7_set_certificates(VALUE self,
|
|
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_iterate(rb_each, ary, ossl_pkcs7_set_certs_i, self);
|
|
|
|
@@ -591,7 +611,7 @@ ossl_pkcs7_set_certificates(VALUE self,
|
|
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
|
|
@@ -621,7 +641,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ar
|
|
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_iterate(rb_each, ary, ossl_pkcs7_set_crls_i, self);
|
|
|
|
@@ -631,7 +651,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ar
|
|
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 -up ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c.ossl10 ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c
|
|
--- ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c.ossl10 2007-03-12 05:12:32.000000000 +0100
|
|
+++ ruby-1.8.6.369/ruby-1.8.6-p369/ext/openssl/ossl_ssl.c 2009-08-26 12:08:48.000000000 +0200
|
|
@@ -89,12 +89,18 @@ static char *ossl_sslctx_attrs[] = {
|
|
static char *ossl_ssl_attr_readers[] = { "io", "context", };
|
|
static char *ossl_ssl_attrs[] = { "sync_close", };
|
|
|
|
+#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),
|
|
@@ -144,7 +150,7 @@ static VALUE
|
|
ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self)
|
|
{
|
|
VALUE ssl_method;
|
|
- SSL_METHOD *method = NULL;
|
|
+ OSSL_MORE_CONST SSL_METHOD *method = NULL;
|
|
SSL_CTX *ctx;
|
|
int i;
|
|
char *s;
|
|
@@ -407,7 +413,7 @@ ossl_sslctx_setup(VALUE self)
|
|
}
|
|
|
|
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;
|
|
@@ -805,7 +811,7 @@ static VALUE
|
|
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) {
|