diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-11 21:20:20 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-11 21:20:20 +0000 |
| commit | ed2a386f587e5ee045dee23ec52fc7dcf7f91314 (patch) | |
| tree | e6ba403740b12968b0edf1615be540b89050ac95 /ext/openssl/ossl.c | |
| parent | 2fc95b6399d7120f38fa9a00b76bd4e3a30c5267 (diff) | |
* ext/openssl/ossl.c (ossl_x509_sk2ary, ossl_x509crl_sk2ary): add
functions to convert STACK into Array.
* ext/openssl/ossl.h: add prototypes.
* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_set_certificates,
ossl_pkcs7_get_certificates, ossl_pkcs7_get_crls,
ossl_pkcs7_set_crls): add functions for PKCS7#certificates=
PKCS7#certificates, PKCS7#crls= and PKCS7#crls.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl.c')
| -rw-r--r-- | ext/openssl/ossl.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index 581da783eb..6646bafc2e 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -90,8 +90,7 @@ ossl_x509_ary2sk(VALUE ary) return sk; } -#if 0 -#define OSSL_SK2ARY(name, type) \ +#define OSSL_IMPL_SK2ARY(name, type) \ VALUE \ ossl_##name##_sk2ary(STACK *sk) \ { \ @@ -101,7 +100,7 @@ ossl_##name##_sk2ary(STACK *sk) \ \ if (!sk) { \ OSSL_Debug("empty sk!"); \ - return rb_ary_new(); \ + return Qnil; \ } \ num = sk_num(sk); \ if (num < 0) { \ @@ -116,9 +115,8 @@ ossl_##name##_sk2ary(STACK *sk) \ } \ return ary; \ } -OSSL_SK2ARY(x509, X509) -OSSL_SK2ARY(x509crl, X509_CRL) -#endif +OSSL_IMPL_SK2ARY(x509, X509) +OSSL_IMPL_SK2ARY(x509crl, X509_CRL) static VALUE ossl_str_new(int size) |