Merge remote-tracking branch 'crater/vendor/OPENSSL' into rel4_0
commit6b1daeb6e1cf660435c4d6661045c4129dd1a377
authorSascha Wildner <saw@online.de>
Thu, 19 Mar 2015 20:22:12 +0000 (19 21:22 +0100)
committerSascha Wildner <saw@online.de>
Thu, 19 Mar 2015 20:22:12 +0000 (19 21:22 +0100)
treeafbf2e5ee6f8f8cb5446d84734371bebf8686ed8
parent94d43c2d640a8e99e3191de5cd4da3480a0187ce
parent9eaaad393e25112c87cecd9ae1ad7faf1adb5480
Merge remote-tracking branch 'crater/vendor/OPENSSL' into rel4_0
crypto/openssl/crypto/des/des_old.h
crypto/openssl/crypto/engine/eng_cryptodev.c
crypto/openssl/crypto/uid.c
crypto/openssl/ssl/srtp.h