aboutsummaryrefslogtreecommitdiffstats
path: root/ext/openssl/ossl.h
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-06-29 22:07:55 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-07-10 17:51:03 +0900
commit5d73437f13abe344123afc1dafcca9585284be05 (patch)
tree7c736c656c366d5242dc872210ecbe98aed484f2 /ext/openssl/ossl.h
parent9d5c823c07b576a4cce55d75392064182b2ec3bc (diff)
downloadruby-openssl-5d73437f13abe344123afc1dafcca9585284be05.tar.gz
Refactor common verify callback code
There is a function ossl_verify_cb() that fetches the custom callback Proc from X509_STORE/X509_STORE_CTX and calls it, but it was not very useful for SSL code. It's only used in ossl_x509store.c and ossl_ssl.c so move X509::Store specific code to ossl_x509store.c. Also make struct ossl_verify_cb_args and ossl_call_verify_cb_proc() local to ossl.c.
Diffstat (limited to 'ext/openssl/ossl.h')
-rw-r--r--ext/openssl/ossl.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 2317fa8b..c15a25bc 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -154,14 +154,7 @@ void ossl_clear_error(void);
extern int ossl_store_ctx_ex_verify_cb_idx;
extern int ossl_store_ex_verify_cb_idx;
-struct ossl_verify_cb_args {
- VALUE proc;
- VALUE preverify_ok;
- VALUE store_ctx;
-};
-
-VALUE ossl_call_verify_cb_proc(struct ossl_verify_cb_args *);
-int ossl_verify_cb(int, X509_STORE_CTX *);
+int ossl_verify_cb_call(VALUE, int, X509_STORE_CTX *);
/*
* String to DER String