Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 10 | -10/+10 |
|\ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 10 | -10/+10 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 3 | -3/+3 |
| | * | Update FSF address | Vicențiu Ciorbaru | 2019-05-11 | 7 | -7/+7 |
* | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-03-29 | 1 | -2/+3 |
|\ \ \ | |/ / | |||||
| * | | MDEV-15587 AES test fails, segfaults in EVP_CipherInit_ex | Marko Mäkelä | 2019-03-29 | 1 | -2/+3 |
* | | | Windows : fix broken build with OpenSSL | Vladislav Vaintroub | 2018-09-08 | 1 | -1/+2 |
* | | | MDEV-15513 use EVP_MD_CTX_{new,free} instead of EVP_MD_CTX_{create, destroy} | Alexander Kuleshov | 2018-05-21 | 1 | -2/+2 |
|/ / | |||||
* | | MDEV-14567: CRYPTO_set_mem_functions fails in FIPS mode | Daniel Black | 2018-02-07 | 1 | -1/+1 |
* | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 2 | -14/+2 |
|\ \ | |/ | |||||
| * | MDEV-14343 Server crash on FIPS with openssl-1.0.2k | Sergei Golubchik | 2018-01-30 | 2 | -21/+3 |
* | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 2 | -5/+5 |
* | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -1/+1 |
* | | MDEV-13698 stack overflow (OpenSSL on Windows) | Sergei Golubchik | 2017-09-18 | 1 | -1/+1 |
* | | MDEV-12763 10.2 uses deprecated openssl 1.0 apis even with 1.1 | Sergei Golubchik | 2017-09-18 | 2 | -2/+2 |
* | | fix compilation with OpenSSL 1.1 | Sergei Golubchik | 2017-07-13 | 1 | -1/+2 |
* | | cleanup: check_openssl_compatibility() | Sergei Golubchik | 2017-07-05 | 1 | -22/+22 |
* | | fix crashes with openssl fips builds | Sergei Golubchik | 2017-05-10 | 1 | -2/+2 |
* | | MDEV-10332 support for OpenSSL 1.1 and LibreSSL | Sergei Golubchik | 2017-05-09 | 5 | -138/+140 |
* | | MDEV-10332 support for OpenSSL 1.1 and LibreSSL | Georg Richter | 2017-05-09 | 3 | -47/+122 |
* | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-06 | 1 | -0/+26 |
|\ \ | |/ | |||||
| * | MDEV-11663 Create services for functionality used by plugins | Vladislav Vaintroub | 2017-04-27 | 1 | -0/+26 |
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 9 | -315/+278 |
|\ \ | |/ | |||||
| * | remove old API for SHA2 | Sergei Golubchik | 2017-03-10 | 2 | -69/+0 |
| * | my_sha2 service | Sergei Golubchik | 2017-03-10 | 6 | -11/+91 |
| * | cleanup: generalize my_sha1.cc | Sergei Golubchik | 2017-03-10 | 2 | -133/+189 |
| * | cleanup: remove a duplicate file | Sergei Golubchik | 2017-03-10 | 2 | -104/+0 |
* | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -4/+4 |
* | | Fix for MDEV-11174: | Georg Richter | 2017-02-01 | 1 | -0/+3 |
|/ | |||||
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -0/+4 |
|\ | |||||
| * | after-merge: 10.0 part of MDEV-9249 (ERR_remove_state) | Sergei Golubchik | 2015-12-21 | 1 | -0/+4 |
* | | New encryption API. Piece-wise encryption. | Sergei Golubchik | 2015-09-04 | 2 | -275/+368 |
* | | MDEV-8281 aes_decrypt crashes in block_crypt() | Sergei Golubchik | 2015-06-27 | 1 | -1/+1 |
* | | my_aes_encrypt_gcm() and my_aes_decrypt_gcm() | Sergei Golubchik | 2015-06-02 | 1 | -1/+85 |
* | | my_aes_get_size() | Sergei Golubchik | 2015-06-02 | 1 | -8/+10 |
* | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 2 | -21/+29 |
|\ \ | |/ | |||||
| * | MDEV-7788 my_md5 crashes with openssl in fips mode | Sergei Golubchik | 2015-05-03 | 1 | -6/+12 |
| * | MDEV-7697 Client reports ERROR 2006 (MySQL server has gone away) or ERROR 201... | Sergei Golubchik | 2015-05-03 | 1 | -6/+13 |
* | | MDEV-8162 func_str crashes on SELECT AES_DECRYPT(AES_ENCRYPT(...)) on line 107 | Sergei Golubchik | 2015-05-15 | 1 | -23/+24 |
* | | MDEV-8022 Assertion `rc == 0' failed in ma_encrypt on dropping an encrypted A... | Sergei Golubchik | 2015-05-13 | 1 | -51/+61 |
* | | move AES_CTR to its own greatly simplified function | Sergei Golubchik | 2015-05-13 | 1 | -32/+41 |
* | | remove now-empty my_aes.{h,cc} | Sergei Golubchik | 2015-04-09 | 3 | -52/+28 |
* | | encryption plugin controls the encryption | Sergei Golubchik | 2015-04-09 | 2 | -193/+39 |
* | | remove old my_aes_encrypt/decrypt | Sergei Golubchik | 2015-04-08 | 1 | -229/+0 |
* | | yassl padding | Sergei Golubchik | 2015-04-08 | 1 | -11/+33 |
* | | my_aes* functions: support for different key lengths | Sergei Golubchik | 2015-04-08 | 1 | -14/+38 |
* | | yassl support | Sergei Golubchik | 2015-04-05 | 1 | -30/+63 |
* | | unify my_{en|de}crypt_{cbc|ecb|ctr}. no yassl support yet. | Sergei Golubchik | 2015-04-05 | 2 | -559/+96 |
* | | simplify my_crypt.cc, remove duplicate code | Sergei Golubchik | 2015-04-05 | 1 | -278/+30 |
* | | encryption cleanup: small changes | Sergei Golubchik | 2015-04-05 | 1 | -95/+0 |