Commit Graph

1458 Commits

Author SHA1 Message Date
Steffen Jaeckel
11bdffcf05 fix-up 719d297e9f 2018-06-22 00:31:44 +02:00
karel-m
250eced904 Merge pull request #408 from libtom/pr/fix-cve-2018-12437
ecc_sign_hash blinding CVE-2018-12437
(cherry picked from commit 6aef5e3765cb84dd610883932c170975cf254167)
2018-06-22 00:17:24 +02:00
Steffen Jaeckel
94132324a9 fix testvectors for two-key 3des
(cherry picked from commit e4a03ca72ad0d3b54342756090dab92af88a2537)
2018-05-31 14:18:44 +02:00
Steffen Jaeckel
4c2ae4758e fix "two-key 3des"-related things
(cherry picked from commit 715103a2038432d93537b0f0419717da4b9ee850)
2018-05-31 14:18:44 +02:00
Steffen Jaeckel
615b361673 no need to include wchar.h in all cases
(cherry picked from commit a32d1afd1097ed1534004891d1322aa621473367)
2018-05-31 14:18:44 +02:00
Steffen Jaeckel
4c2bb90dec Merge pull request #382 from ararslan/aa/freebsd
Make the build logic more robust for BSD systems
(cherry picked from commit 5ab8dcf04d13494c17e503d121efc79748d5f401)
2018-05-31 14:18:13 +02:00
Steffen Jaeckel
e7f4c6e47f Merge pull request #392 from orbea/libtool
makefile.shared: Respect LIBTOOL.
(cherry picked from commit a528528a2b0bbce7f894c6b572611d80b9705ede)
2018-05-31 14:18:01 +02:00
Steffen Jaeckel
3d6181d0a7 there should be no need to pass CFLAGS when linking
(cherry picked from commit 196f25e32fafa221e5d1cbe7706cc510434a3212)
2018-05-31 14:16:54 +02:00
karel-m
d16e5b0b05 Merge pull request #379 from libtom/pr/clang-tidy-misc-misplaced-widening-cast
clang-tidy: misc-misplaced-widening-cast
(cherry picked from commit 248352c36f0352f8d7cb202499e825900af76151)

With back-ported patch from src/misc/copy_or_zeromem.c back to
src/encauth/ccm/ccm_memory.c
2018-04-13 09:56:43 +02:00
karel-m
00dfe66081 Merge pull request #378 from libtom/pr/clang-tidy-misc-suspicious-string-compare
clang-tidy: misc-suspicious-string-compare
(cherry picked from commit 24f933d22ab0b6680a3d0f8d0424d15b0273ace7)
2018-04-13 09:54:03 +02:00
karel-m
1783100e7b Merge pull request #377 from libtom/pr/clang-tidy-void-return
clang-tidy: readability-redundant-control-flow
(cherry picked from commit 4cc8d08e503af686dd7062ac8edd405b12f48ab4)
2018-04-13 09:53:59 +02:00
karel-m
92c5082a25 Merge pull request #375 from libtom/pr/fix-unused-const-variable
Fix -Wunused-const-variable in aes_tab.c
(cherry picked from commit 5c31c3d01656848fb8647aaab4d1a5f4f45770f1)
2018-04-13 09:53:59 +02:00
Steffen Jaeckel
719d297e9f Merge pull request #373 from libtom/fix/der-recursion-limit
implement DER recursion limit
(cherry picked from commit af67321bf3cde1a470c679e459ebb8189e38c9bd)
2018-04-13 09:52:11 +02:00
Steffen Jaeckel
3249dcb963 allow TAB_SIZE to be defined at compile-time 2018-04-06 10:27:12 +02:00
Steffen Jaeckel
70ec9b3b35 back-port of the bugfix done in #363 2018-04-04 19:31:36 +02:00
Steffen Jaeckel
24aab18d5b Merge pull request #359 from vchong/ltc_ctr
ltc: ctr: improve performance
(cherry picked from commit 9b80d07487bed20575b9846ba0d4bcdc280ae8c0)
2018-04-04 19:27:40 +02:00
Steffen Jaeckel
affb3d70cb improve fortuna_import()
This makes fortuna_import() kinda compliant to the "Update seed file"
behavior of the original paper.
It differs from the original behavior in that it allows to import
seed files which are larger	than 64 bytes.

(cherry picked from commit 39d4a14c29c97f002b85038bdcdc2a788f83fe73)
2018-04-04 19:25:31 +02:00
Steffen Jaeckel
89dffe6c7e add comment to Fortuna docs
(cherry picked from commit cccd1e305302cb28391765d2e5c2ddd21d41385c)
2018-04-04 19:25:31 +02:00
Steffen Jaeckel
415c57f3af don't ignore additional data on SOBER128-PRNG import
(cherry picked from commit d502869728298e9cc7d5261cad084e3d6cc4deea)
2018-04-04 19:25:31 +02:00
Steffen Jaeckel
b9fa4c063a fortuna_import() shouldn't ignore additional input
(cherry picked from commit 0c05e5386f836a8cbf4bfbc12bc9113f974b6d61)
2018-04-04 19:25:31 +02:00
Steffen Jaeckel
67d8ca19f5 ensure that fortuna has been seeded properly
(cherry picked from commit 04ce8cf613f635a8445b5de09cdd58847f0fcd64)
2018-04-04 19:25:31 +02:00
karel-m
243898972c Merge pull request #351 from libtom/pr/fix-time_cipher_lrw
LTC_EASY & time_cipher_lrw
(cherry picked from commit ea5b6cdce9d369dbf070677575c1c1fd6dc78622)
2018-04-04 19:19:52 +02:00
Steffen Jaeckel
873240e7a0 Merge pull request #350 from libtom/fix/no-file-warnings
Fix warnings in `XMAC_file()` functions when compiling with `LTC_NO_FILE`.
(cherry picked from commit 11cda2e274b415c6ab6a6a2f49fdbf9d7251897f)
2018-04-04 19:19:19 +02:00
Steffen Jaeckel
e08fd8630f Merge branch 'release/1.18.1' 2018-01-22 11:02:57 +01:00
Steffen Jaeckel
60df7d360a Fix 'fixme check'
The error produced by `make zipup` - but ignored by make - was:

```
...
fixme check
makefile_include.mk:448: recipe for target 'zipup' failed
make: [zipup] Error 123 (ignored)
mkdir -p libtomcrypt-...
```
2018-01-22 11:01:34 +01:00
Steffen Jaeckel
c7ff3bb86e Bump revision 2018-01-22 10:45:28 +01:00
Steffen Jaeckel
08e0424d52 Update changes 2018-01-22 10:06:54 +01:00
Steffen Jaeckel
4800543664 add -p switch to install commands in GNU makefiles
This fixes #340

[skip ci]

(cherry picked from commit fc6eb3ecf07e1cceb5ce85907db8191877704570)
2018-01-22 10:05:03 +01:00
Tetsuya Yoshizaki
144839a8db ltc: ctr: update pt and ct after acceleration
Problem occurs in the condition of the following case:

1st decryption:
Decrypt a ciphertext whose length is a multiple of the block size (16B)
(len = n * block_size)
2nd decryption:
Decrypt the continuing ciphertext whose length is not a multiple of the
block size
(len = m * block_size + l)

In this case accel_ctr_encrypt() is firstly used at the 2nd decryption.
If pt and ct are not updated, the top (l = len % block_size) bytes of
decryption result are sometimes destroyed.

From: Tetsuya Yoshizaki <yoshizaki.tetsuya@socionext.com>
Signed-off-by: Tetsuya Yoshizaki <yoshizaki.tetsuya@socionext.com>
Signed-off-by: Victor Chong <victor.chong@linaro.org>
(cherry picked from commit d1d3ae2d1e705f36e7d313aa4a9b61c0a146ee44)
2018-01-19 10:01:03 +01:00
Steffen Jaeckel
5501572b35 Merge pull request #339 from libtom/minor_improvements
Minor improvements
(cherry picked from commit df8ed5c76b66f5891c8eeb274769a3f8f7dad086)
2018-01-15 00:39:26 +01:00
Steffen Jaeckel
f4d2b37cf4 Merge pull request #337 from libtom/fix/prng_pthread
prevent undefined behavior with LTC_PTHREAD
(cherry picked from commit 45db2a9d9a8fca00948edb285e06dfb2ea5a4828)
2017-12-17 01:20:32 +01:00
Karel Miko
dd868600b3 fix staticfunc_name detection
(cherry picked from commit 6d71d657ef0371ac50c51ef9001e2e340dedf95a)
2017-12-17 01:05:53 +01:00
Steffen Jaeckel
10ad3b5b41 fixup type of type in ltc_asn1_list doc
(cherry picked from commit 5e3e7e5304ed5eb73208e0e46ef76e9b03b0f4af)
2017-12-17 01:05:43 +01:00
Steffen Jaeckel
cec171c17e Update changes 2017-12-05 18:41:11 +01:00
Steffen Jaeckel
c7bdb247bf Update makefiles 2017-12-05 18:40:57 +01:00
Steffen Jaeckel
cfaf964284 Bump version 2017-12-05 18:40:49 +01:00
Steffen Jaeckel
ce93eaa577 add fixme-check to zipup make-target
(cherry picked from commit 6c83a2f36365a44a739bb6f8d932b7c6f6a411e0)
2017-12-05 18:39:46 +01:00
Steffen Jaeckel
f9e90f5b1c revert the change of MAXBLOCKSIZE
Currently this only plays a role in HMAC which still uses dynamic
allocation depending on the real blocksize defined by the hash
algorithm.
2017-12-05 17:46:08 +01:00
Steffen Jaeckel
f122e9b887 Merge pull request #329 from libtom/pr/sha3-blocksize
Correct SHA3 block sizes
(cherry picked from commit 64d028832b36559af753f8c341c53720e5b33aba)
2017-12-05 17:43:46 +01:00
Steffen Jaeckel
13d91e7c8b Merge pull request #327 from libtom/fix/ccm_segfault
Fix ccm_memory() cleaning user-supplied key
(cherry picked from commit 85ac227862eceb3b22c0852a7dc363d46c2dd532)
2017-12-05 09:23:06 +01:00
Steffen Jaeckel
368dc60ff3 Merge pull request #326 from libtom/pr/ccm_process
fixes #323 ccm_process fails to process input buffer longer than 256
(cherry picked from commit 7c4c61d7ef3cbf8ff8ebaad9976224364a688b3c)
2017-12-05 09:21:52 +01:00
Karel Miko
153b897984 helper.pl - detect sizeof without brackets
(cherry picked from commit b7e35e9f57f5747d497e1101a624092b8b633302)
2017-12-05 09:21:27 +01:00
Karel Miko
f10c2055dc helper.pl - improved detection of static functions without _
(cherry picked from commit 5c34fb2bad2cc23fc2c038158a606d7b83c33170)
2017-12-05 09:21:17 +01:00
Karel Miko
a674de7408 Merge branch 'diamondo25-patch-2' into develop
Fix not defined warnings (-Wundef)

(cherry picked from commit 617698e54459ec9f31c894ba83c6f4dfc5570291)
2017-12-05 09:20:41 +01:00
karel-m
7f6af93798 Merge pull request #320 from diamondo25/patch-1
Remove duplicate prototypes
(cherry picked from commit b4eae5231dfbbc2f34509a8e09f7111d189c25df)
2017-12-05 09:20:15 +01:00
karel-m
00ca140c57 Merge pull request #316 from libtom/pr/register-all
register_all_* should return CRYPT_OK on success
(cherry picked from commit e4763d940a03a18ec56810152c3dda79991258ac)
2017-12-05 09:19:40 +01:00
Steffen Jaeckel
521d0737ea fix typo
(cherry picked from commit 442bb90a51621deb38a5f9dce890db0f3b312e49)
2017-12-05 09:17:30 +01:00
Steffen Jaeckel
035e958edd Merge pull request #310 from libtom/pr/fix-changes
proper 1.18.0 date in changes
(cherry picked from commit a6c8be292eb623faf8c2d3bb01d4a9120b6e4ade)
2017-12-05 09:16:30 +01:00
Steffen Jaeckel
0676c9aec7 Merge branch 'release/1.18.0' 2017-10-10 15:51:36 +02:00
Steffen Jaeckel
c165f3a23a Update makefiles 2017-10-10 15:48:35 +02:00