summaryrefslogtreecommitdiff
path: root/lib/crypto
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Raimo Niskanen2016-10-042-7/+40
|\
| * Merge branch 'RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896' into maintRaimo Niskanen2016-10-042-4/+25
| |\
| | * Fix compilation when OpenSSL doesn't support RC4Andreas Schultz2016-09-222-3/+24
| * | Merge branch 'legoscia/crypto/no-rc2/PR-1163/OTP-13895' into maintRaimo Niskanen2016-10-042-3/+15
| |\ \ | | |/ | |/|
| | * Fix compilation when OpenSSL doesn't support RC2Magnus Henoch2016-09-142-3/+15
* | | Merge branch 'sverker/include-erl_nif/PR-1171'Sverker Eriksson2016-09-222-2/+2
|\ \ \
| * | | Use more correct delimiters for erl_nif.h includeTuncer Ayaz2016-09-192-2/+2
* | | | Merge tag 'OTP-19.1'Henrik Nord2016-09-212-1/+27
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Prepare releaseErlang/OTP2016-09-202-1/+27
| |/
* | Merge branch 'maint'Raimo Niskanen2016-09-131-2/+2
|\ \ | |/
| * Silence warnings in cryptoRaimo Niskanen2016-09-131-2/+2
* | Merge branch 'maint'Raimo Niskanen2016-09-075-21/+94
|\ \ | |/
| * Merge branch 'michaesc/crypto/honour-OPENSSL_NO_DES/ERL-203/OTP-13783' into m...Raimo Niskanen2016-09-075-21/+94
| |\
| | * Add '_cfb' alias for misspelled '_cbf' cipherRaimo Niskanen2016-09-025-17/+58
| | * Fix badarg -> notsup and test casesRaimo Niskanen2016-09-022-16/+45
| | * Honour OPENSSL_NO_DESRaimo Niskanen2016-09-021-3/+6
* | | Merge branch 'maint'Hans Bolinder2016-09-021-1/+1
|\ \ \ | |/ /
| * | doc: Correct errors introduced by Editorial changesHans Bolinder2016-09-011-1/+1
* | | Merge branch 'gotthardp/crypto/add-cmac/ERL-82/PR-1138/OTP-13779'Raimo Niskanen2016-08-314-6/+180
|\ \ \ | |/ / |/| |
| * | Skip the cmac test cases on older OpenSSLPetr Gotthard2016-08-121-0/+8
| * | Added a reference to cmac RFC in the description part of the man pagePetr Gotthard2016-08-121-0/+3
| * | Fix building crypto/cmac_nif on 64-bit machines.Petr Gotthard2016-07-301-1/+1
| * | crypto:cmac calculating the Cipher-based Message Authentication CodePetr Gotthard2016-07-304-6/+169
| |/
* | Fix segfault in crypto by increasing algo_cipher arrayDuncaen2016-08-031-1/+1
|/
* Prepare releaseErlang/OTP2016-06-212-1/+47
* Revert "Prepare release"Erlang/OTP2016-06-022-47/+1
* Prepare releaseErlang/OTP2016-06-022-1/+47
* crypto: Add OpenSSL_version macrosSverker Eriksson2016-05-261-21/+36
* crypto: Allow any AES-GCM tag length for non-EVP implSverker Eriksson2016-05-261-2/+2
* crypto: Workaround buggy GCM via EVPSverker Eriksson2016-05-261-2/+56
* Revert "Prepare release"Erlang/OTP2016-05-122-47/+1
* Prepare releaseErlang/OTP2016-05-112-1/+47
* crypto: Deprecate rand_bytes/1Ingela Anderton Andin2016-04-255-58/+12
* Merge branch 'mururu/crypto/aes-gcm-tag-len.PR-998.OTP-13483'Sverker Eriksson2016-04-184-8/+61
|\
| * crypto: Add test for AES-GCMYuki Ito2016-04-051-1/+45
| * crypto: Enable AES-GCM tag length to changeYuki Ito2016-03-263-7/+16
* | Merge branch 'henrik/update-copyrightyear'Henrik Nord2016-04-1320-20/+20
|\ \
| * | update copyright-yearHenrik Nord2016-03-1520-20/+20
| |/
* | Merge branch 'sverker/crypto/skip-link_test-without-ldd'Sverker Eriksson2016-04-121-1/+3
|\ \
| * | crypto: Skip link_test if no 'ldd' availableSverker Eriksson2016-04-061-1/+3
| |/
* | crypto: Optimize digest/cipher lookupsSverker Eriksson2016-03-291-81/+95
* | crypto: Raise 'notsup' if lacking 'characteristic_two_field'Sverker Eriksson2016-03-291-8/+18
|/
* Merge tag 'OTP-18.3'Lars Thorsen2016-03-152-1/+24
|\
| * Prepare releaseErlang/OTP2016-03-142-1/+24
* | Makefiles: Remove test_server from include path and code pathBjörn Gustavsson2016-02-171-1/+1
* | Eliminate use of test_server.hrl and test_server_line.hrlBjörn Gustavsson2016-02-172-3/+2
* | Merge branch 'maint'Sverker Eriksson2016-02-083-135/+114
|\ \ | |/
| * Only use supported EC curves in crypto testsDániel Szoboszlay2016-01-282-135/+111
| * Check the result of EC_GROUP_new_curve_* callsDániel Szoboszlay2016-01-271-0/+3
| * crypto: Fix bug for multiple blocks for AES-ECBAndrew Bennett2016-01-142-2/+21