diff options
author | technorama <technorama@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-26 07:11:23 +0000 |
---|---|---|
committer | technorama <technorama@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-26 07:11:23 +0000 |
commit | 14017831536e23d4d98c94edeffa720d869e88f8 (patch) | |
tree | bcf4236de05e4b07f331f55a58c310b6692137fc | |
parent | a0ec9f61d1cff2df36c254fb78bfdaa14b0292a9 (diff) |
* ext/openssl/ossl_pkey_{ec,dh,dsa,rsa}.c: Remove useless warnings.
* ext/openssl/ossl_asn1.c: Simplify code.
* ext/openssl/ossl_ssl_session.c Fix compiler warnings.
Undefine #id if SSL_SESSION_get_id is not supported.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ext/openssl/ossl_pkey_dh.c | 2 | ||||
-rw-r--r-- | ext/openssl/ossl_pkey_dsa.c | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_pkey_ec.c | 3 | ||||
-rw-r--r-- | ext/openssl/ossl_pkey_rsa.c | 2 | ||||
-rw-r--r-- | ext/openssl/ossl_ssl_session.c | 6 |
6 files changed, 13 insertions, 13 deletions
@@ -1,3 +1,12 @@ +Tue Feb 26 16:06:00 2008 Technorama Ltd. <oss-ruby@technorama.net> + + * ext/openssl/ossl_pkey_{ec,dh,dsa,rsa}.c: Remove useless warnings. + + * ext/openssl/ossl_asn1.c: Simplify code. + + * ext/openssl/ossl_ssl_session.c Fix compiler warnings. + Undefine #id if SSL_SESSION_get_id is not supported. + Tue Feb 26 15:43:42 2008 Tanaka Akira <akr@fsij.org> * parse.y (tokadd_escape): refactored. [ruby-core:15657] diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index a6924a6bb8..bd4cc756e7 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -524,11 +524,9 @@ Init_ossl_dh() } #else /* defined NO_DH */ -# warning >>> OpenSSL is compiled without DH support <<< void Init_ossl_dh() { - rb_warning("OpenSSL is compiled without DH support"); } #endif /* NO_DH */ diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c index 95dc426366..78b60c6edf 100644 --- a/ext/openssl/ossl_pkey_dsa.c +++ b/ext/openssl/ossl_pkey_dsa.c @@ -477,12 +477,8 @@ Init_ossl_dsa() } #else /* defined NO_DSA */ -# warning >>> OpenSSL is compiled without DSA support <<< - void Init_ossl_dsa() { - rb_warning("OpenSSL is compiled without DSA support"); } - #endif /* NO_DSA */ diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c index c3a15e722b..210054121d 100644 --- a/ext/openssl/ossl_pkey_ec.c +++ b/ext/openssl/ossl_pkey_ec.c @@ -1576,10 +1576,7 @@ void Init_ossl_ec() } #else /* defined NO_EC */ -# warning >>> OpenSSL is compiled without EC support <<< - void Init_ossl_ec() { } - #endif /* NO_EC */ diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c index 4a690a7cb5..9ac69e7ded 100644 --- a/ext/openssl/ossl_pkey_rsa.c +++ b/ext/openssl/ossl_pkey_rsa.c @@ -585,11 +585,9 @@ Init_ossl_rsa() } #else /* defined NO_RSA */ -# warning >>> OpenSSL is compiled without RSA support <<< void Init_ossl_rsa() { - rb_warning("OpenSSL is compiled without RSA support"); } #endif /* NO_RSA */ diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c index b347f2c1b2..82de3efbe3 100644 --- a/ext/openssl/ossl_ssl_session.c +++ b/ext/openssl/ossl_ssl_session.c @@ -174,7 +174,7 @@ static VALUE ossl_ssl_session_get_id(VALUE self) p = SSL_SESSION_get_id(ctx, &i); - return rb_str_new(p, i); + return rb_str_new((const char *) p, i); } #endif @@ -200,7 +200,7 @@ static VALUE ossl_ssl_session_to_der(VALUE self) else if (len >= sizeof(buf)) ossl_raise(eSSLSession, "i2d_SSL_SESSION too large"); - return rb_str_new(p, len); + return rb_str_new((const char *) p, len); } /* @@ -289,6 +289,8 @@ void Init_ossl_ssl_session(void) #ifdef HAVE_SSL_SESSION_GET_ID rb_define_method(cSSLSession, "id", ossl_ssl_session_get_id, 0); +#else + rb_undef_method(cSSLSession, "id"); #endif rb_define_method(cSSLSession, "to_der", ossl_ssl_session_to_der, 0); rb_define_method(cSSLSession, "to_pem", ossl_ssl_session_to_pem, 0); |