Commit Graph

1801 Commits

Author SHA1 Message Date
Francois Perrad
698790fdeb explicit condition 2018-09-07 17:06:09 +02:00
Steffen Jaeckel
e5f56d4617
Merge pull request #429 from libtom/rework/oid
Remove oid_st
2018-09-07 16:49:25 +02:00
Steffen Jaeckel
fb7b8799cd rename enum public_key_algorithms to something more generic 2018-09-07 11:58:54 +02:00
Steffen Jaeckel
4cf2e80346 remove oid_st 2018-09-07 11:58:54 +02:00
Steffen Jaeckel
af23fdd1c2 Update makefiles 2018-09-07 11:58:54 +02:00
Steffen Jaeckel
645460a5d5 add pk_oid_cmp_with_asn1() 2018-09-07 11:58:54 +02:00
Steffen Jaeckel
e318f6f1e3 re-work pk_oid_str functions a bit 2018-09-07 11:58:54 +02:00
Steffen Jaeckel
1a90da844c only print der flexi-test on higher debug level
it's smashing the stack for some inputs :>
2018-09-07 11:58:54 +02:00
Steffen Jaeckel
caff4cea40 change pk_get_oid() to return a string 2018-09-07 11:58:54 +02:00
Steffen Jaeckel
41599db904 Update makefiles 2018-09-07 11:58:54 +02:00
Steffen Jaeckel
fdc97f8648 move oid functions to own folder 2018-09-07 11:58:54 +02:00
Steffen Jaeckel
86ff14100f
Merge pull request #430 from libtom/fix/oid-decode
Fix OID issues
2018-09-07 11:57:38 +02:00
Steffen Jaeckel
2e9c80cbc1 fix der_length_object_identifier()
... there are only three root nodes

As of X6.90 Ch. 8.19.4: "NOTE – This packing of the first two
object identifier components recognizes that only three values
are allocated from the root node..."
2018-09-07 08:24:25 +02:00
Steffen Jaeckel
6584569872 add another OID testcase for root-node 3 2018-09-07 08:24:25 +02:00
Steffen Jaeckel
4ffdb915f0 fix der_decode_object_identifier() 2018-09-07 08:24:25 +02:00
Steffen Jaeckel
079ed04b17 add OID testcase from x.690 2018-09-07 08:24:25 +02:00
Steffen Jaeckel
bd542c6c30
Merge pull request #433 from orbea/rlibtool
makefile.shared: Support rlibtool.
2018-09-07 08:24:03 +02:00
orbea
ccc18b9eda makefile.shared: Support rlibtool.
When building libtomcrypt with rlibtool instead of libtool it will fail
when rlibtool fails to parse the generated libtool which does not exist.

Since rlibtool should be the default choice for most slibtool users in
the future this patch will use slibtool-shared instead which will
correctly build the shared library.

This could also help build the shared library on additional targets and
hosts where the stock libtool does not have shared libraries enabled.
2018-09-06 18:19:10 +02:00
Steffen Jaeckel
c9c3c42739 Merge branch 'streams-make_state_names_consistent' into develop
This fixes #427
2018-07-10 07:11:39 +02:00
buggywhip
380d1d2452 streams-make_state_names_consistent 2018-07-09 17:31:24 -07:00
karel-m
c9376c29ba
Merge pull request #428 from libtom/pr/fix-gcc-warnings1
fix -Wmissing-declarations -Wmissing-prototypes -Wmissing-noreturn
2018-07-09 11:32:35 +02:00
Karel Miko
ba8fa04f9a reorganize ifdefs in tv_gen 2018-07-08 21:59:06 +02:00
Karel Miko
4fb0562a3b fix -Wmissing-declarations -Wmissing-prototypes -Wmissing-noreturn 2018-07-07 19:54:08 +02:00
Steffen Jaeckel
b5009d704c
Merge pull request #426 from libtom/feature/pkcs12
Feature/pkcs12
2018-07-06 18:37:54 +02:00
Steffen Jaeckel
53fc5694c9 re-work pkcs12 a bit 2018-07-06 18:26:43 +02:00
Steffen Jaeckel
6fe1b5b765 Update makefiles 2018-07-06 18:26:43 +02:00
Karel Miko
a96997dd29 add pkcs12_utf8_to_utf16() 2018-07-06 18:26:43 +02:00
Karel Miko
b3f483a204 add pkcs12_kdf() 2018-07-06 18:26:43 +02:00
karel-m
98ad88b3ee
Merge pull request #422 from libtom/pr/clang-tidy-google-readability-braces-around-statements
fix clang-tidy warning: google-readability-braces-around-statements
2018-07-06 17:53:12 +02:00
Karel Miko
a3dab04074 fix clang-tidy warning: google-readability-braces-around-statements 2018-07-06 13:58:15 +02:00
karel-m
e02694cfc2
Merge pull request #393 from libtom/pr/ecc-doc-update
ECC doc update
2018-07-06 13:44:17 +02:00
Karel Miko
4f3bce103f move ecc_make_key_ex to Legacy Key Generation
[skip ci]
2018-07-06 13:42:54 +02:00
Karel Miko
b30c27066d new names: ecc_find_curve, ecc_set_curve 2018-07-06 13:42:38 +02:00
Steffen Jaeckel
415c19b8df re-work ECC docs a bit
[skip ci]
2018-07-06 13:42:38 +02:00
Karel Miko
57c884d50d ECC doc update
[skip ci]
2018-07-06 13:42:38 +02:00
karel-m
d3c5890a1b
Merge pull request #423 from libtom/pr/ecc_set_dp--ecc_set_curve
rename ecc_set_dp >> ecc_set_curve + ecc_get_curve >> ecc_find_curve
2018-07-06 13:39:51 +02:00
Karel Miko
4bec98f88c rename ecc_get_curve to ecc_find_curve 2018-07-04 10:43:15 +02:00
Karel Miko
611ca6bf14 rename ecc_set_dp (+related) to ecc_set_curve 2018-07-04 10:41:10 +02:00
Karel Miko
091d52828c Update makefiles 2018-07-04 10:41:02 +02:00
karel-m
4473953742
Merge pull request #415 from libtom/pr/clang-tidy-else-after-return
fix clang-tidy warning: readability-else-after-return
2018-07-03 22:45:28 +02:00
Karel Miko
ed2ec2e3ed add script .ci/clang-tidy.sh 2018-07-03 22:43:26 +02:00
Karel Miko
22b764ec85 fix clang-tidy warning: readability-else-after-return 2018-07-03 22:42:15 +02:00
karel-m
6ac6d36bf4
Merge pull request #416 from libtom/pr/clang-tidy-readability-non-const-parameter
fix clang-tidy warning: readability-non-const-parameter
2018-07-03 22:37:34 +02:00
Karel Miko
ae6aa3dd86 fix clang-tidy warning: readability-non-const-parameter 2018-07-03 22:37:05 +02:00
karel-m
48ad48f900
Merge pull request #417 from libtom/pr/clang-tidy-readability-inconsistent-declaration-parameter-name
fix clang-tidy warning: inconsistent-declaration-parameter-name
2018-07-03 22:35:56 +02:00
Karel Miko
12c3091077 fix clang-tidy warning: readability-inconsistent-declaration-parameter-name - issue #376 2018-07-03 22:33:48 +02:00
karel-m
168f3bd1db
Merge pull request #421 from libtom/pr/tests-cosmetics
fix "make test" built with no math provider or multiple providers
2018-07-03 22:30:41 +02:00
Karel Miko
fc056a645d fix "make test" built with no math provider or multiple providers 2018-07-03 00:12:08 +02:00
Steffen Jaeckel
3fb0eea01b show in SCRYPT etc. that we're on develop 2018-07-02 23:25:20 +02:00
Steffen Jaeckel
215ec5f69d Merge tag 'v1.18.2' into develop
libtomcrypt v1.18.2
2018-07-02 23:23:47 +02:00