aboutsummaryrefslogtreecommitdiffstats
path: root/TAR.include
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2016-09-07 17:24:28 +0200
committerRaimo Niskanen <[email protected]>2016-09-07 17:24:28 +0200
commit970309e0cfa8450837ace53caa13dd2301b378b6 (patch)
treeeca696a7a530a381982d7272bcff3df3a2b08946 /TAR.include
parent4fe35ac73e2ca7627f0880e8143a9230885930f0 (diff)
parent05caf563c08b368ad5b6884ea9db3b2484953932 (diff)
downloadotp-970309e0cfa8450837ace53caa13dd2301b378b6.tar.gz
otp-970309e0cfa8450837ace53caa13dd2301b378b6.tar.bz2
otp-970309e0cfa8450837ace53caa13dd2301b378b6.zip
Merge branch 'michaesc/crypto/honour-OPENSSL_NO_DES/ERL-203/OTP-13783' into maint
* michaesc/crypto/honour-OPENSSL_NO_DES/ERL-203/OTP-13783: Add '_cfb' alias for misspelled '_cbf' cipher Fix badarg -> notsup and test cases Honour OPENSSL_NO_DES Conflicts: lib/crypto/c_src/crypto.c
Diffstat (limited to 'TAR.include')
0 files changed, 0 insertions, 0 deletions