diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-12-10 16:59:39 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-12-10 16:59:42 +0900 |
| commit | 5abf287bd3606632c0f2c3d196a7f56bebfa81b8 (patch) | |
| tree | 079958b1d0b8185b3bf2cbb7321e343f4a945723 | |
| parent | c083ff82a79a9e6fe5c7ed1525eb0e6bf0627de9 (diff) | |
| parent | 076da025d0b5820f3a7075b334fd814884c968e8 (diff) | |
| download | ruby-openssl-5abf287bd3606632c0f2c3d196a7f56bebfa81b8.tar.gz | |
Merge changes from Ruby trunk r56927..r56953
* ruby-trunk r56927..r56953: (3 commits)
(r56953) openssl: import fixes from upstream
(r56948) ossl.c: cast
(r56946) openssl: import v2.0.0
Sync-with-trunk: r56953
| -rw-r--r-- | ext/openssl/ossl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index 8269599f..eb71b643 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -180,7 +180,7 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd_) len = RSTRING_LEN(pass); if (len >= OSSL_MIN_PWD_LEN && len <= max_len) { memcpy(buf, RSTRING_PTR(pass), len); - return len; + return (int)len; } } OSSL_Debug("passed data is not valid String???"); |