diff options
| author | rhe <rhe@ruby-lang.org> | 2016-12-01 04:42:10 +0000 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-12-10 16:57:05 +0900 |
| commit | 076da025d0b5820f3a7075b334fd814884c968e8 (patch) | |
| tree | e9b2f5ec4c334815b3addb05724647345f35709b /LICENSE.txt | |
| parent | 66634fb6b9220ff6d2360462a7c0ad94a9a814aa (diff) | |
| download | ruby-openssl-076da025d0b5820f3a7075b334fd814884c968e8.tar.gz | |
openssl: import fixes from upstream
Import the following two commits from upstream:
commit 72126d6c8b88abd69c3565fc3bbbd5ed1e401611
Author: Kazuki Yamaguchi <k@rhe.jp>
Date: Thu Dec 1 22:27:03 2016 +0900
pkey: check existence of EVP_PKEY_get0()
EVP_PKEY_get0() did not exist in early OpenSSL 0.9.8 series. So define
ourselves if needed.
commit 94a1c4e0c5705ad1e9a4ca08cacaa6cba8b1e6f5
Author: Kazuki Yamaguchi <k@rhe.jp>
Date: Thu Dec 1 22:13:22 2016 +0900
test/test_cipher: fix test with OpenSSL 1.0.1 before 1.0.1d
Set the authentication tag before the AAD when decrypting.
Before OpenSSL commit 96f7fafa2431 ("Don't require tag before ciphertext
in AESGCM mode", 2012-10-16, at OpenSSL_1_0_1-stable branch, included in
OpenSSL 1.0.1d), the authentication tag must be set before any calls of
EVP_CipherUpdate().
They should fix build on CentOS 5 and Ubuntu 12.04 respectively.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'LICENSE.txt')
0 files changed, 0 insertions, 0 deletions