diff options
Diffstat (limited to 'ext/openssl/ossl.h')
| -rw-r--r-- | ext/openssl/ossl.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index efb7057adb..33c2083311 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -22,6 +22,12 @@ extern "C" { */ #include <openssl/opensslv.h> +#ifdef HAVE_ASSERT_H +# include <assert.h> +#else +# define assert(condition) +#endif + #if defined(_WIN32) # define OpenFile WINAPI_OpenFile # define OSSL_NO_CONF_API 1 @@ -37,6 +43,10 @@ extern "C" { #include <openssl/conf_api.h> #undef X509_NAME #undef PKCS7_SIGNER_INFO +#if defined(HAVE_OPENSSL_ENGINE_H) && !defined(OPENSSL_NO_ENGINE) +# define OSSL_ENGINE_ENABLED +# include <openssl/engine.h> +#endif #if defined(HAVE_OPENSSL_OCSP_H) # define OSSL_OCSP_ENABLED # include <openssl/ocsp.h> @@ -95,8 +105,18 @@ int string2hex(char *, int, char **, int *); /* * Data Conversion */ +STACK_OF(X509) *ossl_x509_ary2sk0(VALUE); STACK_OF(X509) *ossl_x509_ary2sk(VALUE); STACK_OF(X509) *ossl_protect_x509_ary2sk(VALUE,int*); +VALUE ossl_buf2str(char *buf, int len); +#define ossl_str_adjust(str, p) \ +do{\ + int len = RSTRING(str)->len;\ + int newlen = (p) - (unsigned char*)RSTRING(str)->ptr;\ + assert(newlen <= len);\ + RSTRING(str)->len = newlen;\ + RSTRING(str)->ptr[newlen] = 0;\ +}while(0) /* * our default PEM callback @@ -124,6 +144,13 @@ VALUE ossl_call_verify_cb_proc(struct ossl_verify_cb_args *); int ossl_verify_cb(int, X509_STORE_CTX *); /* + * String to DER String + */ +extern ID ossl_s_to_der; +VALUE ossl_to_der(VALUE); +VALUE ossl_to_der_if_possible(VALUE); + +/* * Debug */ extern VALUE dOSSL; |