aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
Commit message (Collapse)AuthorAgeFilesLines
* restore to original pkcs11.hDaniel Neus2016-08-121-4/+4
|
* Headers can be marked as external by using `<header:external>` in info.txt.Daniel Neus2016-08-122-2/+5
| | | | | | | These headers are copied/linked into build_dir/include/external This has the advantage that external includes can be taken as they are, they haven't to be modified. Fixes amalgamation build with enabled pkcs#11 module
* Merge GH #570 X509_Certificate APIsJack Lloyd2016-08-103-9/+58
|
* Merge GH #551 Add frp256v1 curveJack Lloyd2016-08-022-0/+12
|\
| * Merge branch 'master' into frp256v1Simon Cogliani2016-07-312-7/+9
| |\
| * \ Merge branch 'master' into frp256v1Simon Cogliani2016-07-305-13/+30
| |\ \
| * | | ANSSI elliptic curve cryptography frp256v1Simon Cogliani2016-07-242-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | - Parameters available here: https://www.legifrance.gouv.fr/affichTexte.do?cidTexte=JORFTEXT000024668816 - DER format according to the ANS1 syntax defined in ANSI X9.62 standard available here: http://www.ssi.gouv.fr/agence/publication/publication-dun-parametrage-de-courbe-elliptique-visant-des-applications-de-passeport-electronique-et-de-ladministration-electronique-francaise/
* | | | Merge GH #560Jack Lloyd2016-08-022-0/+8
|\ \ \ \
| * | | | add X509_Time::to_std_timepoint()Daniel Neus2016-07-282-0/+8
| | |/ / | |/| |
* | | | Merge GH #559 PKCS #11 fixesJack Lloyd2016-08-025-1/+3208
|\ \ \ \ | |_|_|/ |/| | |
| * | | include external PKCS#11 headers into botanDaniel Neus2016-07-265-1/+3208
| | | |
* | | | Use stat instead of lstat in get_files_recursive.Jack Lloyd2016-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise symlinked files are ignored. GH #565
* | | | Check for __SIZEOF_INT128__ before using TI modeJack Lloyd2016-07-301-6/+8
| |/ / |/| | | | | | | | | | | Otherwise we run into problems on 64-bit CPUs with 32-bit userland. GH #563
* | | Merge GH #556 Add DH negative tests. Fix DH keygen, did not call gen_check ↵Jack Lloyd2016-07-271-1/+8
|\ \ \ | | | | | | | | | | | | due to setting m_x earlier
| * | | fix: load_check() was called instead of gen_check() during DH private key ↵Daniel Neus2016-07-261-1/+8
| |/ / | | | | | | | | | generation
* | | Merge GH #554 Add PKCS #1 v1.5 ID for SHA-512/256 signaturesJack Lloyd2016-07-271-0/+8
|\ \ \
| * | | add SHA-512/256 PKCS#1 hash identifierDaniel Neus2016-07-251-0/+8
| | |/ | |/|
* | | Merge GH #553 EME/pubkey test improvements. Small EME refactor.Jack Lloyd2016-07-272-11/+13
|\ \ \ | |_|/ |/| |
| * | eme / pubkey test improvementsDaniel Neus2016-07-252-11/+13
| |/ | | | | | | | | | | - add test for EME::maximum_input_size() - additionally use maximum_input_size() before pad() in OAEP and PKCS1 (remove code duplication) - prevent C4800 MSVC warning
* / SSE2 had been disabled for testing, missed it on checkin of 6907e196Jack Lloyd2016-07-251-1/+1
|/
* Merge GH #549 MP and SIMD header refactoringJack Lloyd2016-07-2325-2183/+1546
|\
| * Merge asm into single mp_madd.h and mp_asmi.h filesJack Lloyd2016-07-2125-2183/+1546
| | | | | | | | | | | | | | Avoids some cut and paste, also removes the need for special logic in configure.py for handling mp module specially. Merge SIMD classes into a single type SIMD_4x32
* | Merge GH #543 Add RDRAND_RNGJack Lloyd2016-07-215-39/+170
|\ \ | |/ |/|
| * Fix header guard formatJack Lloyd2016-07-201-2/+2
| | | | | | | | | | configure.py expects all header guards to match a specific form, for finding them when generating the amalgamation file.
| * Add RDRAND_RNGJack Lloyd2016-07-195-39/+170
| | | | | | | | | | | | | | | | For those that are willing to trust uninspectible hardware. :) Changes RDRAND entropy source to call RDRAND_RNG Add --rdrand flag to rng cmdlet
* | Merge GH #548 Parallel hash tests, fix memory leakJack Lloyd2016-07-211-1/+1
|\ \
| * | improve parallel hash tests + memory leak fixDaniel Neus2016-07-201-1/+1
| |/ | | | | | | | | | | | | | | | | | | - add one test with SHA-256,SHA-512 - test Parallel::clone() - test Parallel ctor - fix memory leak in Parallel::clone(): Currently Parallel::clone() calls hash->clone() (first heap allocation) and after this clone() calls Parallel(const std::vector<HashFunction*>& in) which does another heap allocation. So its sufficient to pass the hash pointer to the Parallel ctor instead of a clone
* | Merge GH #547 Fix SipHash::clear, more MAC testsJack Lloyd2016-07-211-3/+4
|\ \
| * | fix SipHash::clear() and MAC test improvementsDaniel Neus2016-07-201-3/+4
| |/ | | | | | | | | | | | | | | Fix for SipHash::clear() which does not clear the complete state. Test additions: - add a test for MessageAuthenticationCode::verify_mac() - test MessageAuthenticationCode::clear()
* / Make Stream_Cipher::set_iv() pure virtualRené Korthaus2016-07-205-7/+15
|/ | | | | | | | | | It provided a default implementation that only checked that the length was correct, but ignored the actual data and did not notify the caller, which seemed like a rather odd behaviour. The only implementation that used this default implementation, RC4, now throws an exception.
* Merge GH #541 More ECIES testsJack Lloyd2016-07-191-2/+2
|\
| * add more ECIES testsDaniel Neus2016-07-191-2/+2
| |
* | Compile fixJack Lloyd2016-07-181-1/+1
| |
* | Fix proc_walk - would always return 0 entropy collected.Jack Lloyd2016-07-182-7/+10
| | | | | | | | | | | | Fix BeOS stat reader - was calling wrong function on the rng. Remove entropy estimate defines from build.h, no longer used.
* | Merge GH #520 RNG changesJack Lloyd2016-07-1843-695/+837
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Stateful_RNG base class which handles reseeding after some amount of output (configurable at instantiation time, defaults to the build.h value) as well as detecting forks (just using pid comparisons, so still vulnerable to pid wraparound). Implemented by HMAC_RNG and HMAC_DRBG. I did not update X9.31 since its underlying RNG should already be fork safe and handle reseeding at the appropriate time, since a new block is taken from the underlying RNG (for the datetime vector) for each block of output. Adds RNG::randomize_with_input which for most PRNGs is just a call to add_entropy followed by randomize. However for HMAC_DRBG it is used for additional input. Adds tests for HMAC_DRBG with AD from the CAVS file. RNG::add_entropy is implemented by System_RNG now, as both CryptGenRandom and /dev/urandom support receiving application provided data. The AutoSeeded_RNG underlying type is currently selectable in build.h and defaults to HMAC_DRBG(SHA-256). AutoSeeded_RNG provides additional input with each output request, consisting of the current pid, a counter, and timestamp (unless the application explicitly calls randomize_with_input, in which case we just take what they provided). This is the same hedge used in HMAC_RNGs output PRF. AutoSeeded_RNG is part of the base library now and cannot be compiled out. Removes Entropy_Accumulator type (which just served to bridge between the RNG and the entropy source), instead the Entropy_Source is passed a reference to the RNG being reseeded, and it can call add_entropy on whatever it can come up with.
| * Address some review comments from @cordneyJack Lloyd2016-07-179-27/+29
| | | | | | | | | | | | | | | | | | Use consistent naming for the max output before reseed parameter. The constant (default) value is renamed to BOTAN_RNG_DEFAULT_MAX_OUTPUT_BEFORE_RESEED, since without the DEFAULT_ it reads like a compile time maximum instead. Use uint8_t instead of byte.
| * Fix assignmentJack Lloyd2016-07-171-1/+1
| |
| * Revamp entropy pollingJack Lloyd2016-07-1730-377/+294
| | | | | | | | | | Remove Entropy_Accumulator, instead have entropy sources directly add entropy to the RNG.
| * Move poll logic to Entropy_SourcesJack Lloyd2016-07-173-18/+27
| |
| * Add Stateful_RNGJack Lloyd2016-07-1713-170/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Handles fork checking for HMAC_RNG and HMAC_DRBG AutoSeeded_RNG change - switch to HMAC_DRBG as default. Start removing the io buffer from entropy poller. Update default RNG poll bits to 256. Fix McEliece test, was using wrong RNG API. Update docs.
| * Make the DRBG hash selectable in build.h with BOTAN_AUTO_RNG_DRBG_HASH_FUNCTIONJack Lloyd2016-07-172-3/+3
| | | | | | | | Add some missing overrides
| * If EPERM when writing to the random device, return silently.Jack Lloyd2016-07-171-1/+13
| | | | | | | | | | | | | | | | | | That failure seems like an explicit system policy decision, so accept it as such. Versus say EBADF or EFAULT which would instead suggest a library bug. This return is seen on OS X Travis CI, unclear if this is a problem with OS X or with how Travis does OS X containers.
| * Switch to HMAC_DRBG for all RNG generation.Jack Lloyd2016-07-1711-241/+414
| | | | | | | | | | | | | | | | Add support and tests for additional_data param to HMAC_DRBG Add Stateful_RNG class which has fork detection and periodic reseeding. AutoSeeded_RNG passes the current pid and time as additional_data
* | Merge GH #535 Use Cipher_Mode instead of Pipe in ECIESJack Lloyd2016-07-173-22/+20
|\ \
| * | replace (deprecated) Pipe API with Cipher_Mode in ECIESDaniel Neus2016-07-133-22/+20
| | |
* | | Merge GH #533 DLIES changesJack Lloyd2016-07-173-100/+261
|\ \ \
| * | | DLIES reworkDaniel Neus2016-07-133-100/+261
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With these fixes the implementation is now compatible with bouncycastle and it should operate as it is specified in "DHIES: An encryption scheme based on Diffie-Hellman Problem" or in BSI technical guideline TR-02102-1. In addition to the already present XOR-encrypion/decryption mode it's now possible to use DLIES with a block cipher. Previously the input to the KDF was the concatenation of the (ephemeral) public key and the secret value derived by the key agreement operation: ``` secure_vector<byte> vz(m_my_key.begin(), m_my_key.end()); vz += m_ka.derive_key(0, m_other_key).bits_of(); const size_t K_LENGTH = length + m_mac_keylen; secure_vector<byte> K = m_kdf->derive_key(K_LENGTH, vz); ``` I don't know why this was implemented like this. But now the input to the KDF is only the secret value obtained by the key agreement operation. Furthermore the order of the output was changed from {public key, tag, ciphertext} to {public key, ciphertext, tag}. Multiple test vectors added that were generated with bouncycastle and some with botan itself.
* | | Merge GH #537 Add test vectors for KDF1/ISO18033Jack Lloyd2016-07-172-3/+3
|\ \ \ | |_|/ |/| |
| * | Add test vectors for KDF1/ISO18033René Korthaus2016-07-152-3/+3
| |/
* | Fix SecRandomCopyBytes call with older OS X SDKsJack Lloyd2016-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | In 10.8 (and presumably older) versions, the header for SecRandomCopyBytes is SecRandom.h, and Security.h does not include SecRandom.h With this change, the include of Security.h may be redundant for all versions, but I have no way to test this. GH #528