diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-15 20:55:57 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-15 20:55:57 +0000 |
commit | 6d72ea84a9bd86485d24a7de22bbda68f714b611 (patch) | |
tree | 70eb4e1f90412ab8767fc861f0ad197bb7d0f0c2 /ext/openssl | |
parent | 3b76c076bc71004e4711565f6960fad42de6550e (diff) | |
parent | 2f1eb739412a85579ff4de5567474e7c8fe1b7c3 (diff) |
sorry. I made wrong tags.v1_8_5_72
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_5_72@12992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
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, 2 insertions, 9 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 336b468eb2..eaa1fe6eb2 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -208,7 +208,6 @@ 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 deleted file mode 100644 index a3b132bc50..0000000000 --- a/ext/openssl/ossl_pkcs5.h +++ /dev/null @@ -1,6 +0,0 @@ -#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 1a456f2c48..5c7e6e89a2 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()))) - ossl_raise(eX509NameError, NULL); + rb_raise(eX509NameError, NULL); GetX509Name(self, name); if (!X509_NAME_print_ex(out, name, 0, iflag)){ BIO_free(out); - ossl_raise(eX509NameError, NULL); + rb_raise(eX509NameError, NULL); } str = ossl_membio2str(out); |