Feature #2022 » openssl-build-fix-v2.patch
| 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 STACK _STACK
|
||
|
#endif
|
||
|
/*
|
||
|
* String to HEXString conversion
|
||
|
*/
|
||
|
int string2hex(const unsigned 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 | ||
|---|---|---|
|
}
|
||
|
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));
|
||
|
}
|
||
| ext/openssl/ossl_x509attr.c | ||
|---|---|---|
|
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,
|
||
| ext/openssl/ossl_x509crl.c | ||
|---|---|---|
|
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();
|
||
| ... | ... | |
|
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);
|
||
|
}
|
||