mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-27 05:38:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,851 Commits 172 Branches 267 Tags
Commit Graph

9223 Commits

Author SHA1 Message Date
Kusumit Ghoderao
7333ed3efa Add max iterations test case for cmac 
Signed-off-by: Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com>
 2023-07-04 15:17:03 +05:30
Kusumit Ghoderao
d80183864a Add test case for zero input cost 
Signed-off-by: Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com>
 2023-07-04 15:17:02 +05:30
Kusumit Ghoderao
671320633c Add test cases for key and plain inputs 
Signed-off-by: Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com>
 2023-07-04 15:17:02 +05:30
Kusumit Ghoderao
9d4c74f25c Add test cases for output validation of pbkdf2 cmac 
PBKDF2_AES_CMAC_PRF_128 test vectors are generated using PyCryptodome library:
https://github.com/Legrandin/pycryptodome

Steps to generate test vectors:
1. pip install pycryptodome
2. Use the python script below to generate Derived key (see description for details):

Example usage:
pbkdf2_cmac.py <password> <salt> <number_of_iterations> <derived_key_len>
derive_ms.py 4a30314e4d45 54687265616437333563383762344f70656e54687265616444656d6f 16384 16

password         : 4a30314e4d45
salt             : 54687265616437333563383762344f70656e54687265616444656d6f
input cost       : 16384
derived key len  : 16
output           : 8b27beed7e7a4dd6c53138c879a8e33c

"""
from Crypto.Protocol.KDF import PBKDF2
from Crypto.Hash import CMAC
from Crypto.Cipher import AES
import sys

def main():
    #check args
    if len(sys.argv) != 5:
        print("Invalid number of arguments. Expected: <password> <salt> <input_cost> <derived_key_len>")
        return

    password    = bytes.fromhex(sys.argv[1])
    salt        = bytes.fromhex(sys.argv[2])
    iterations  = int(sys.argv[3])
    dklen       = int(sys.argv[4])

    # If password is not 16 bytes then we need to use CMAC to derive the password
    if len(password) != 16:
        zeros     = bytes.fromhex("00000000000000000000000000000000")
        cobj_pass = CMAC.new(zeros, msg=password, ciphermod=AES, mac_len=16)
        passwd    = bytes.fromhex(cobj_pass.hexdigest())
    else:
        passwd = password

    cmac_prf = lambda p,s: CMAC.new(p, s, ciphermod=AES, mac_len=16).digest()

    actual_output = PBKDF2(passwd, salt=salt, dkLen=dklen, count=iterations, prf=cmac_prf)

    print('password         : ' + password.hex())
    print('salt             : ' + salt.hex())
    print('input cost       : ' + str(iterations))
    print('derived key len  : ' + str(dklen))
    print('output           : ' + actual_output.hex())

if __name__ == "__main__":
    main()
"""

Signed-off-by: Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com>
 2023-07-04 15:17:01 +05:30
Kusumit Ghoderao
1d3fca21b1 Add test cases for input validation of pbkdf2 cmac 
Signed-off-by: Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com>
 2023-07-04 15:17:01 +05:30
Dave Rodgman
9cf17dad9d
Merge pull request #7851 from daverodgman/fix-unused-aes 
Fix AES dependencies - build TF-M config cleanly
 2023-07-03 16:49:00 +01:00
Gilles Peskine
e554f1b9c0
Merge pull request #7853 from lpy4105/issue/7816/add-commands-for-files-in-parse_input 
7831 follow-up: fix wrong dependency name and wrong commands
 2023-07-03 16:00:45 +02:00
Dave Rodgman
0d539c222c
Merge pull request #7702 from silabs-Kusumit/PBKDF2_out_of_range_input_cost 
PBKDF2: Out of range input cost
 2023-07-03 09:58:22 +01:00
Manuel Pégourié-Gonnard
56b159a12a
Merge pull request #7627 from mprse/ffdh_tls13_v2 
Make use of FFDH keys in TLS 1.3 v.2
 2023-07-03 10:12:33 +02:00
Manuel Pégourié-Gonnard
45e009aa97
Merge pull request #7814 from valeriosetti/issue7746 
PK: refactor wrappers in the USE_PSA case
 2023-07-03 09:32:31 +02:00
Tom Cosgrove
c4a760c538
Merge pull request #7849 from davidhorstmann-arm/fix-string-to-names-retcode 
Fix false success return code in `mbedtls_x509_string_to_names()`
 2023-06-30 14:28:29 +01:00
Andrzej Kurek
78ecf41f22 Change spaces to a tab in a makefile recipe 
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
 2023-06-30 08:42:05 -04:00
Andrzej Kurek
03478d2b90
Merge branch 'development' into issue/7816/add-commands-for-files-in-parse_input 
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
 2023-06-30 14:38:05 +02:00
Dave Rodgman
a2c1a387e4
Merge pull request #7630 from daverodgman/prefer-intrinsics 
Prefer intrinsics over asm for AES-NI
 2023-06-30 11:39:38 +01:00
Dave Rodgman
2d07a72b35
Merge pull request #7821 from davidhorstmann-arm/simplify-test-dn-formatting 
Simplify directory name comparison in AuthorityKeyIdentifier tests
 2023-06-30 11:38:03 +01:00
Manuel Pégourié-Gonnard
3f2448b75e
Merge pull request #7802 from AndrzejKurek/go-go-der-certs 
Use DER format for x509 SAN tests
 2023-06-30 09:36:08 +02:00
Pengyu Lv
18730ddbcf fix fragile way to refer to server1.req.sha256 
The original varible $< is fragile especially
when there are multiple rules for the same
target.

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
 2023-06-30 00:23:13 +08:00
Dave Rodgman
1a4936ab86 Remove options not known to older gcc 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
 2023-06-29 14:07:50 +01:00
Valerio Setti
e77307738d pk_wrap: add support for ECDSA verify for opaque keys 
This commit also add tests to verify the functionality

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
 2023-06-29 14:33:26 +02:00
Dave Rodgman
88651c45e4 Change build target as Cortex-A32 not supported on CI 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
 2023-06-29 12:35:51 +01:00
Dave Rodgman
0f0f769cd0 Nicer formatting 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
 2023-06-29 12:10:45 +01:00
Dave Rodgman
fb374e6cff Split armcc tests to separate component 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
 2023-06-29 12:00:21 +01:00
Dave Rodgman
cd04020dac Add comment 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
 2023-06-29 11:59:47 +01:00
Dave Rodgman
6001fb241d Test combinations of macros for aes.o 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
 2023-06-29 09:30:28 +01:00
Pengyu Lv
ab266491f0 Make parse_input targets depend on files in parse_input if possible 
Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
 2023-06-29 13:06:55 +08:00
Andrzej Kurek
7d55dd2356 Fix malformed directoryName extensions 
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
 2023-06-29 10:36:44 +08:00
Pengyu Lv
7d7c208647 fix the command of server5-sha%.crt 
This makes the rule could generate
parse_input/server5-sha*.crt correctly.

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
 2023-06-29 10:36:44 +08:00
Pengyu Lv
a0350f7304 fix wrong dependency file path 
This commit is generated by below script
```
for i in `ls parse_input`; do
    if [ -f $i ]; then
        continue
    fi
    # Add parse_input/ prefix when $i is a dependency.
    sed -i "/:\(.*[^\/]\)$i/,/^$/s/$i/parse_input\/$i/g" Makefile
done
```

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
 2023-06-29 10:36:34 +08:00
Dave Rodgman
904c58967c Revert "Extend TF-M build test to test all shipped configs" 
This reverts commit 443018537e26cdc8fc98373b14355650d1c8c62c.

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
 2023-06-28 18:07:22 +01:00
Paul Elliott
92a55bf5ea
Merge pull request #7793 from minosgalanakis/ecp/6025_fast_reduction_dispatch 
[Bignum] Fast reduction dispatch
 2023-06-28 17:38:37 +01:00
Dave Rodgman
443018537e Extend TF-M build test to test all shipped configs 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
 2023-06-28 16:28:37 +01:00
Przemek Stekiel
3484db4ce7 Change ffdh testing strategy 
- Full tests generated by script only for ffdhe2048 group
- Single G->m and m->G exchange test for each other group

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
 2023-06-28 13:31:38 +02:00
Dave Rodgman
c164c07cfe Add TF-M build test to all.sh 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
 2023-06-28 09:57:16 +01:00
Janos Follath
c439c678e3
Merge pull request #7719 from davidhorstmann-arm/second-jpake-state-machine-rework 
Change J-PAKE internal state machine
 2023-06-28 08:59:23 +01:00
Przemek Stekiel
7dda271c1d Fix description of functions 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
 2023-06-28 09:16:08 +02:00
Tom Cosgrove
db041cc82f
Merge pull request #7665 from AndrzejKurek/optimize-error-translation-code-size 
Optimize error translation code size
 2023-06-28 08:09:00 +01:00
Minos Galanakis
163d346355 test_suite_ecp: Changed to BITS_TO_LIMBS(224) * 2 in ecp_mod_p_generic_raw. 
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
 2023-06-27 21:34:47 +01:00
Minos Galanakis
23394b17bc test_suite_ecp: Updated ecp_mod_p_generic_raw to use the BITS_TO_LIMBS macro. 
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
 2023-06-27 16:31:59 +01:00
David Horstmann
b50ae1fef1 Add regression testcase for string_to_names() 
Test against a string with no '=' or ',' in it, which previously caused
mbedtls_x509_string_to_names() to return 0.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
 2023-06-27 15:32:14 +01:00
Jerry Yu
dfc2e26ddf Short too long lines 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-06-27 17:05:51 +08:00
Jerry Yu
8ee086dc50 remove parse input only files from all_final 
script
```
for i in `ls parse_input`
do
    if [ -f $i ]
    then
        continue
    fi
    sed -i "/^all_final.*$i\$/d" Makefile
done
```

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-06-27 17:02:45 +08:00
Przemek Stekiel
c31a798f45 Replace MBEDTLS_ECDH_C dependency in ssl-opt tests 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
 2023-06-27 10:58:50 +02:00
Jerry Yu
7d2a54c04d fix wrong dependency file path 
`test_csr_v3_all.csr.der` has been moved to `parse_input`

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-06-27 16:57:36 +08:00
Jerry Yu
92d1ec6567 Change path for the files only exits in parse_input 
This commit is generated by below script
```
for i in `ls parse_input`
do
    if [ -f $i ]
    then
        continue
    fi
    sed -i "s/^$i:/parse_input\/$i:/g" Makefile
done
```

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-06-27 16:53:25 +08:00
Jerry Yu
54e8632ae6 copy command for parse_input/* when it exists in data_files 
This commit are generate by below script
```
for i in `ls parse_input`
do
    if [ -f $i ]
    then
        sed -i "s/^$i:/parse_input\/$i $i:/g" Makefile
    fi
done
```

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
 2023-06-27 16:40:00 +08:00
Kusumit Ghoderao
cbfe333c2b add test case for zero input cost 
Signed-off-by: Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com>
 2023-06-27 11:19:12 +05:30
Kusumit Ghoderao
42b02b9fe9 Add test and test case for input cost greater than vendor maximum 
Signed-off-by: Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com>
 2023-06-27 11:12:27 +05:30
Minos Galanakis
93baf39095 test_suite_ecp.data: Added test cases for modulo-1 in coordinate representation. 
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
 2023-06-26 23:19:04 +01:00
Przemek Stekiel
8bfe897ab0 Add ssl-opt functions to check openssl with ffdh support and openssl ephemeral key exchange 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
 2023-06-26 16:33:00 +02:00
Valerio Setti
603271ce3d test: solve disparities in driver coverage analysis for no_ecp_at_all() 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
 2023-06-26 16:02:47 +02:00