Project

General

Profile

Download (5.6 KB)

Feature #2022 » 0001-Apply-Jeroen-van-Meeuwen-s-and-Nobu-Nakada-s-OpenSSL.patch

hongli (Hongli Lai), 01/05/2010 07:05 PM

View differences:

ext/openssl/ossl.c
#define OSSL_IMPL_SK2ARY(name, type) \
VALUE \
ossl_##name##_sk2ary(STACK *sk) \
ossl_##name##_sk2ary(STACK_OF(type) *sk) \
{ \
type *t; \
int i, num; \
......
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(); \
......
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; \
ext/openssl/ossl.h
} while (0)
/*
* Compatibility
*/
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
#define OSSL_MORE_CONST const
#define STACK _STACK
#else
#define OSSL_MORE_CONST
#endif
/*
* String to HEXString conversion
*/
int string2hex(char *, int, char **, int *);
ext/openssl/ossl_pkcs7.c
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);
......
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
......
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);
......
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
......
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);
......
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
ext/openssl/ossl_ssl.c
*/
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),
......
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;
......
}
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;
......
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) {
(2-2/7)