diff options
| author | naruse <naruse@ruby-lang.org> | 2011-03-24 07:29:21 +0000 |
|---|---|---|
| committer | naruse <naruse@ruby-lang.org> | 2011-03-24 07:29:21 +0000 |
| commit | 74760b2d19c2ca41c4768131d462f9185b8fb291 (patch) | |
| tree | 35f07bf81653bbf8f29bb35ad161923dfc20258a /ext/openssl/ossl.c | |
| parent | d0696c1d9c63f151978d96e7bcdf9f8435088f5f (diff) | |
| download | ruby-openssl-history-74760b2d19c2ca41c4768131d462f9185b8fb291.tar.gz | |
* ext/openssl/ossl.c: surpress warning: shorten-64-to-32.
* ext/openssl/ossl.h: ditto.
* ext/openssl/ossl_asn1.c: ditto.
* ext/openssl/ossl_bio.c: ditto.
* ext/openssl/ossl_bn.c: ditto.
* ext/openssl/ossl_cipher.c: ditto.
* ext/openssl/ossl_hmac.c: ditto.
* ext/openssl/ossl_ns_spki.c: ditto.
* ext/openssl/ossl_ocsp.c: ditto.
* ext/openssl/ossl_pkcs5.c: ditto.
* ext/openssl/ossl_pkey.c: ditto.
* ext/openssl/ossl_pkey_dh.c: ditto.
* ext/openssl/ossl_pkey_dsa.c: ditto.
* ext/openssl/ossl_pkey_ec.c: ditto.
* ext/openssl/ossl_pkey_rsa.c: ditto.
* ext/openssl/ossl_rand.c: ditto.
* ext/openssl/ossl_ssl.c: ditto.
* ext/openssl/ossl_x509ext.c: ditto.
* ext/openssl/ossl_x509name.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl.c')
| -rw-r--r-- | ext/openssl/ossl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index 1e4f935..d20b6b4 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -170,7 +170,7 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd) rflag = flag ? Qtrue : Qfalse; pass = rb_protect(ossl_pem_passwd_cb0, rflag, &status); if (status) return -1; /* exception was raised. */ - len = RSTRING_LEN(pass); + len = RSTRING_LENINT(pass); if (len < 4) { /* 4 is OpenSSL hardcoded limit */ rb_warning("password must be longer than 4 bytes"); continue; @@ -302,7 +302,7 @@ ossl_make_error(VALUE exc, const char *fmt, va_list args) } ERR_clear_error(); - if(len > BUFSIZ) len = strlen(buf); + if(len > BUFSIZ) len = rb_long2int(strlen(buf)); return rb_exc_new(exc, buf, len); } |