diff options
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/ossl.h | 1 | ||||
| -rw-r--r-- | ext/openssl/ossl_pkcs5.h | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509name.c | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index eaa1fe6eb2..336b468eb2 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -208,6 +208,7 @@ void ossl_debug(const char *, ...); #include "ossl_ocsp.h" #include "ossl_pkcs12.h" #include "ossl_pkcs7.h" +#include "ossl_pkcs5.h" #include "ossl_pkey.h" #include "ossl_rand.h" #include "ossl_ssl.h" diff --git a/ext/openssl/ossl_pkcs5.h b/ext/openssl/ossl_pkcs5.h new file mode 100644 index 0000000000..a3b132bc50 --- /dev/null +++ b/ext/openssl/ossl_pkcs5.h @@ -0,0 +1,6 @@ +#if !defined(_OSSL_PKCS5_H_) +#define _OSSL_PKCS5_H_ + +void Init_ossl_pkcs5(void); + +#endif /* _OSSL_PKCS5_H_ */ diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c index 5c7e6e89a2..1a456f2c48 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -188,11 +188,11 @@ ossl_x509name_to_s(int argc, VALUE *argv, VALUE self) return ossl_x509name_to_s_old(self); else iflag = NUM2ULONG(flag); if (!(out = BIO_new(BIO_s_mem()))) - rb_raise(eX509NameError, NULL); + ossl_raise(eX509NameError, NULL); GetX509Name(self, name); if (!X509_NAME_print_ex(out, name, 0, iflag)){ BIO_free(out); - rb_raise(eX509NameError, NULL); + ossl_raise(eX509NameError, NULL); } str = ossl_membio2str(out); |