diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-15 13:24:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-15 13:24:51 +0000 |
| commit | f298a1a670060f3b37d3e4ef588973d8758d6c0a (patch) | |
| tree | f8069a5e6cfe6edceb982d8a4ed8d3a9a137c197 /ext/openssl | |
| parent | 6a4bfa57fd93120ff58b27195b4307f316f97b4e (diff) | |
* ext/digest/digest.c (rb_digest_instance_update,
rb_digest_instance_finish, rb_digest_instance_reset,
rb_digest_instance_block_length): %s in rb_raise() expects char*.
[ruby-dev:31222]
* ext/openssl/ossl.h: include ossl_pkcs5.h. [ruby-dev:31231]
* ext/openssl/ossl_pkcs5.h: new file for PKCS5. [ruby-dev:31231]
* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): use ossl_raise()
instead of rb_raise(). [ruby-dev:31222]
* ext/sdbm/_sdbm.c: DOSISH platforms need io.h. [ruby-dev:31232]
* ext/syck/syck.h: include stdlib.h for malloc() and free().
[ruby-dev:31232]
* ext/syck/syck.h (syck_parser_set_input_type): prototype added.
[ruby-dev:31231]
* win32/win32.c: include mbstring.h for _mbspbrk(). [ruby-dev:31232]
* win32.h (rb_w32_getcwd): prototype added. [ruby-dev:31232]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12800 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, 9 insertions, 2 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index b11614560e..a4bc661eb1 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -203,6 +203,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 c1164644e4..b4434d2a34 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -204,11 +204,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); |