Browse Source

Fake/Noop merge of OpenSSL 1.0.2s as we use OpenSSL 1.1.1b on the dev branch

Merge branch 'thirdparty' into thirdparty_dev

# Conflicts:

#	libs/openssl/crypto/dh/dh_pmeth.c
#	libs/openssl/crypto/dsa/dsa_pmeth.c
#	libs/openssl/crypto/ec/ec2_oct.c
#	libs/openssl/crypto/ec/ec_lib.c
#	libs/openssl/crypto/ec/ec_mult.c
#	libs/openssl/crypto/ec/ecp_oct.c

#	libs/openssl/crypto/err/err.c

#	libs/openssl/crypto/rsa/rsa_ossl.c
#	libs/openssl/crypto/rsa/rsa_pmeth.c
#	libs/openssl/include/openssl/opensslv.h

Source commit: 116de6d183fdabebf4c51c554e57e0a7a0ac9844
Martin Prikryl 6 years ago
parent
commit
f5a89686b9

Diff Data Not Available.