1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

ossl_pkcs7.c: typed data

* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_signer_info_type): use
  typed data.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-12 22:37:58 +00:00
parent b8897cd60f
commit ba19bcdda4

View file

@ -31,10 +31,10 @@
if (!(p7si)) { \ if (!(p7si)) { \
ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \ ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
} \ } \
(obj) = Data_Wrap_Struct((klass), 0, PKCS7_SIGNER_INFO_free, (p7si)); \ (obj) = TypedData_Wrap_Struct((klass), &ossl_pkcs7_signer_info_type, (p7si)); \
} while (0) } while (0)
#define GetPKCS7si(obj, p7si) do { \ #define GetPKCS7si(obj, p7si) do { \
Data_Get_Struct((obj), PKCS7_SIGNER_INFO, (p7si)); \ TypedData_Get_Struct((obj), PKCS7_SIGNER_INFO, &ossl_pkcs7_signer_info_type, (p7si)); \
if (!(p7si)) { \ if (!(p7si)) { \
ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \ ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
} \ } \
@ -90,6 +90,20 @@ static const rb_data_type_t ossl_pkcs7_type = {
0, 0, RUBY_TYPED_FREE_IMMEDIATELY, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
}; };
static void
ossl_pkcs7_signer_info_free(void *ptr)
{
PKCS7_SIGNER_INFO_free(ptr);
}
static const rb_data_type_t ossl_pkcs7_signer_info_type = {
"OpenSSL/PKCS7/SIGNER_INFO",
{
0, ossl_pkcs7_signer_info_free,
},
0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
};
/* /*
* Public * Public
* (MADE PRIVATE UNTIL SOMEBODY WILL NEED THEM) * (MADE PRIVATE UNTIL SOMEBODY WILL NEED THEM)