From 404f77ec0b595ea8279750dbd5082f7bed14877f Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 15 Aug 2007 20:17:41 +0000 Subject: * 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_5@12988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 21 +++++++++++++++++++++ ext/openssl/ossl.h | 1 + ext/openssl/ossl_pkcs5.h | 6 ++++++ ext/openssl/ossl_x509name.c | 4 ++-- ext/sdbm/_sdbm.c | 2 +- ext/syck/syck.h | 2 ++ version.h | 2 +- win32/win32.c | 1 + win32/win32.h | 1 + 9 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 ext/openssl/ossl_pkcs5.h diff --git a/ChangeLog b/ChangeLog index 03d65738f4..45b0e2a8f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Thu Aug 16 05:12:05 2007 pegacorn + + * 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] + Thu Aug 16 05:02:39 2007 Nobuyoshi Nakada * bignum.c (rb_cstr_to_inum): check leading non-digits. 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); diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c index 11353e2345..7ffcf8579c 100644 --- a/ext/sdbm/_sdbm.c +++ b/ext/sdbm/_sdbm.c @@ -71,7 +71,7 @@ static int duppair proto((char *, datum)); #include #include -#ifdef MSDOS +#ifdef DOSISH #include #endif #include diff --git a/ext/syck/syck.h b/ext/syck/syck.h index 51a0f0aa9c..bc383ff2de 100644 --- a/ext/syck/syck.h +++ b/ext/syck/syck.h @@ -17,6 +17,7 @@ #define YAML_DOMAIN "yaml.org,2002" #include +#include #include #include "st.h" @@ -399,6 +400,7 @@ int syck_scan_scalar( int, char *, long ); void syck_parser_handler( SyckParser *, SyckNodeHandler ); void syck_parser_error_handler( SyckParser *, SyckErrorHandler ); void syck_parser_bad_anchor_handler( SyckParser *, SyckBadAnchorHandler ); +void syck_parser_set_input_type( SyckParser *, enum syck_parser_input ); void syck_parser_file( SyckParser *, FILE *, SyckIoFileRead ); void syck_parser_str( SyckParser *, char *, long, SyckIoStrRead ); void syck_parser_str_auto( SyckParser *, char *, SyckIoStrRead ); diff --git a/version.h b/version.h index 929500db09..330835fb12 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-16" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070816 -#define RUBY_PATCHLEVEL 72 +#define RUBY_PATCHLEVEL 73 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/win32.c b/win32/win32.c index cdb5b61bc9..784d9eccfe 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -27,6 +27,7 @@ #include #ifdef __MINGW32__ #include +#include #endif #include "win32.h" #include "win32/dir.h" diff --git a/win32/win32.h b/win32/win32.h index 48646da7a3..e11f69afd0 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -193,6 +193,7 @@ extern struct protoent * rb_w32_getprotobyname(char *); extern struct protoent * rb_w32_getprotobynumber(int); extern struct servent * rb_w32_getservbyname(char *, char *); extern struct servent * rb_w32_getservbyport(int, char *); +extern char * rb_w32_getcwd(char *, int); extern char * rb_w32_getenv(const char *); extern int rb_w32_rename(const char *, const char *); extern int rb_w32_stat(const char *, struct stat *); -- cgit v1.2.3