aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
AgeCommit message (Expand)Author
2017-02-03Merge branch 'maint'Hans Nilsson
2017-02-03Merge branch 'maint'Björn-Egil Dahlberg
2017-02-03Fix merge commitBjörn-Egil Dahlberg
2017-02-03erge branch 'maint'Hans Nilsson
2017-02-03Merge branch 'maint-18' into maintHans Nilsson
2017-02-02ssh: document crypto:genarate_key(dh, [P,G,L])Hans Nilsson
2017-02-01Prepare releaseErlang/OTP
2017-01-31crypto: Added optional length to paramlist in generate_keyHans Nilsson
2017-01-31ssh,crypto: prepare for releaseHans Nilsson
2017-01-31Merge branch 'maint'Hans Nilsson
2017-01-27crypto: Added optional length to paramlist in generate_keyHans Nilsson
2017-01-18Merge branch 'maint'Hans Nilsson
2017-01-17Add a missing aes_gcm -spec clause to crypto:block_encrypt/4Leo Liu
2016-12-29crypto: algo_ciper was too small after cipher additionsHans Nilsson
2016-12-20crypto: Support chacha20_poly1305Yuki Ito
2016-12-14Merge tag 'OTP-19.2'Dan Gudmundsson
2016-12-09Prepare releaseErlang/OTP
2016-12-02Support OpenSSL 1.1.0Björn Gustavsson
2016-12-02crypto.c: Disable broken code for ChaCha and Poly1305Björn Gustavsson
2016-11-29warn_obsolete_guard is already defaultRichard Carlsson
2016-11-04[crypto] Remove depricated functionsLars Thorsen
2016-10-11Merge branch 'legoscia/ssl_in_fips_mode/PR-1180/OTP-13921'Hans Nilsson
2016-10-05Merge branch 'master' into sverker/master/load_nif-print-init-errorSverker Eriksson
2016-10-05crypto: Return source line number from failed load/upgradeSverker Eriksson
2016-10-04Merge branch 'maint'Raimo Niskanen
2016-10-04Merge branch 'RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896' into maintRaimo Niskanen
2016-10-04Merge branch 'legoscia/crypto/no-rc2/PR-1163/OTP-13895' into maintRaimo Niskanen
2016-09-29Fix warning tag in fips.xmlMagnus Henoch
2016-09-28Rename SSL_DEFINE to SSL_FLAGSMagnus Henoch
2016-09-28Document FIPS mode supportDániel Szoboszlay
2016-09-28Fix aes_gcm test case in crypto_SUITEMagnus Henoch
2016-09-28Use proper test data for FIPS mode negative testsMagnus Henoch
2016-09-28Filter elliptic curves depending on FIPS modeMagnus Henoch
2016-09-28Skip FIPS tests if we cannot enable FIPS modeMagnus Henoch
2016-09-28Update test suites with FIPS mode supportDániel Szoboszlay
2016-09-28Support using OpenSSL in FIPS modeDániel Szoboszlay
2016-09-28Fix erlang:error/2 calls in crypto.erlMagnus Henoch
2016-09-22Merge branch 'sverker/include-erl_nif/PR-1171'Sverker Eriksson
2016-09-22Fix compilation when OpenSSL doesn't support RC4Andreas Schultz
2016-09-21Merge tag 'OTP-19.1'Henrik Nord
2016-09-20Prepare releaseErlang/OTP
2016-09-19Use more correct delimiters for erl_nif.h includeTuncer Ayaz
2016-09-14Fix compilation when OpenSSL doesn't support RC2Magnus Henoch
2016-09-13Merge branch 'maint'Raimo Niskanen
2016-09-13Silence warnings in cryptoRaimo Niskanen
2016-09-07Merge branch 'maint'Raimo Niskanen
2016-09-07Merge branch 'michaesc/crypto/honour-OPENSSL_NO_DES/ERL-203/OTP-13783' into m...Raimo Niskanen
2016-09-02Add '_cfb' alias for misspelled '_cbf' cipherRaimo Niskanen
2016-09-02Fix badarg -> notsup and test casesRaimo Niskanen
2016-09-02Honour OPENSSL_NO_DESRaimo Niskanen