1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ossl_x509store.c: typed data

Browse Source 
* ext/openssl/ossl_x509store.c (ossl_x509stctx_type): use typed
  data.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-13 00:06:54 +00:00
parent a3fa871534
commit 0c71e2808e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/openssl/ossl_x509store.c
View File

@ -31,10 +31,10 @@
if (!(ctx)) { \ if (!(ctx)) { \
ossl_raise(rb_eRuntimeError, "STORE_CTX wasn't initialized!"); \ ossl_raise(rb_eRuntimeError, "STORE_CTX wasn't initialized!"); \
} \ } \
(obj) = Data_Wrap_Struct((klass), 0, ossl_x509stctx_free, (ctx)); \ (obj) = TypedData_Wrap_Struct((klass), &ossl_x509stctx_type, (ctx)); \
} while (0) } while (0)
#define GetX509StCtx(obj, ctx) do { \ #define GetX509StCtx(obj, ctx) do { \
Data_Get_Struct((obj), X509_STORE_CTX, (ctx)); \ TypedData_Get_Struct((obj), X509_STORE_CTX, &ossl_x509stctx_type, (ctx)); \
if (!(ctx)) { \ if (!(ctx)) { \
ossl_raise(rb_eRuntimeError, "STORE_CTX is out of scope!"); \ ossl_raise(rb_eRuntimeError, "STORE_CTX is out of scope!"); \
} \ } \
@ -356,7 +356,17 @@ ossl_x509store_verify(int argc, VALUE *argv, VALUE self)
/* /*
* Public Functions * Public Functions
*/ */
static void ossl_x509stctx_free(X509_STORE_CTX*); static void ossl_x509stctx_free(void*);
static const rb_data_type_t ossl_x509stctx_type = {
"OpenSSL/X509/STORE_CTX",
{
0, ossl_x509stctx_free,
},
0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
};
VALUE VALUE
ossl_x509stctx_new(X509_STORE_CTX *ctx) ossl_x509stctx_new(X509_STORE_CTX *ctx)
@ -381,8 +391,9 @@ ossl_x509stctx_clear_ptr(VALUE obj)
* Private functions * Private functions
*/ */
static void static void
ossl_x509stctx_free(X509_STORE_CTX *ctx) ossl_x509stctx_free(void *ptr)
{ {
X509_STORE_CTX *ctx = ptr;
if(ctx->untrusted) if(ctx->untrusted)
sk_X509_pop_free(ctx->untrusted, X509_free); sk_X509_pop_free(ctx->untrusted, X509_free);
if(ctx->cert) if(ctx->cert)