Browse Source

Fake/Noop merge of OpenSSL 1.0.1t as we use OpenSSL 1.0.2 on the dev branch

Merge branch 'thirdparty' into thirdparty_dev

Conflicts:
	libs/openssl/crypto/buildinf.h
	libs/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c
	libs/openssl/crypto/opensslv.h
	libs/openssl/crypto/x509/x509.h
	libs/openssl/crypto/x509/x509_err.c
	libs/openssl/ssl/ssl_ciph.c

Source commit: 6f82f1e3cca92da11f37b2674a2ca5448b9548a9
Martin Prikryl 9 years ago
parent
commit
63c788dae6

Diff Data Not Available.