Skip to content

Merge development into psa-api-1.0-beta #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 308 commits into from
Jun 5, 2019
Merged

Merge development into psa-api-1.0-beta #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
308 commits
Select commit Hold shift + click to select a range
f49fedc
Change docs according to review comments
Apr 1, 2019
2ee67a6
Remove mbedtls_ from the static function name
Apr 1, 2019
f7a7f9e
Address review comments regarding ssl_client2 and ssl tests
Apr 1, 2019
dfd22c4
Address comments for x509 tests
Apr 1, 2019
9822c0d
Fix name to function call
Apr 1, 2019
1dbc5a2
Fix errors in AEAD test function
jack-fortanix Mar 7, 2019
ffdf288
Add NIST keywrap as a cipher mode
jack-fortanix Mar 7, 2019
5f28999
Wrap lines at 80 columns
jack-fortanix Apr 2, 2019
b6dc105
Add Wisun Fan device extended key usage
Apr 1, 2019
7b58fb1
Improve documentation of mbedtls_ssl_conf_verify()
Apr 3, 2019
726c97a
Add context-specific CRT verification callbacks
Apr 3, 2019
8927c83
Implement context-specific verification callbacks
Apr 3, 2019
bb425db
Add cmd to use context-specific CRT callback in ssl_client2
Apr 3, 2019
efb440a
Add test exercising context-specific CRT callback to ssl-opt.sh
Apr 3, 2019
f345baf
Fix doxygen documentation of mbedtls_ssl_set_verify()
Apr 3, 2019
ee11be6
Add test for configuration specific CRT callback
yanesca Apr 4, 2019
924270f
Fix typo
yanesca Apr 4, 2019
80d0419
Add guards for MBEDTLS_X509_CRL_PARSE_C in sample
Apr 4, 2019
274024f
Fix a rebase error
jack-fortanix Apr 4, 2019
ef90760
Include crypto config when generating query config
AndrzejKurek Apr 5, 2019
79369cd
Add crypto includes when generating features in generate_features.pl
AndrzejKurek Apr 5, 2019
b4b1ae1
Add description of generate_query_config.pl argument
AndrzejKurek Apr 5, 2019
92f91fc
Add an option to use crypto source files in generated visual c project
AndrzejKurek Apr 5, 2019
1b86e4c
Merge remote-tracking branch 'origin/pr/2106' into development
Patater Apr 5, 2019
6fc099d
Merge remote-tracking branch 'origin/pr/2189' into development
Patater Apr 5, 2019
3d81447
Merge remote-tracking branch 'origin/pr/2192' into development
Patater Apr 5, 2019
c7acf56
Merge remote-tracking branch 'origin/pr/2366' into development
Patater Apr 5, 2019
383d1fa
Add --internal option to list-identifiers.sh
dgreen-arm Apr 4, 2019
62ab1f9
Merge remote-tracking branch 'origin/pr/2405' into development
Patater Apr 5, 2019
d192ba4
Merge remote-tracking branch 'origin/pr/2463' into development
Patater Apr 5, 2019
7c1e619
Merge remote-tracking branch 'origin/pr/2464' into development
Patater Apr 5, 2019
bc5de0f
Merge remote-tracking branch 'origin/pr/2368' into development
Patater Apr 5, 2019
aa34020
Merge remote-tracking branch 'origin/pr/2535' into development
Patater Apr 5, 2019
d7ecbd6
Fix style issues and a typo
yanesca Apr 5, 2019
846ae7a
Document and test flags in x509_verify
yanesca Apr 5, 2019
ae13beb
Rename constant in client2.c
yanesca Apr 5, 2019
4031b31
Make CRT callback tests more robust
yanesca Apr 5, 2019
21cb3c3
Remove ssl_cert_test sample app
Apr 7, 2019
cd9286f
Remove crypto-only related components from all.sh
AndrzejKurek Mar 6, 2019
4a8d2df
all.sh: remove component_test_new_ecdh_context
AndrzejKurek Apr 8, 2019
d037ad6
Give credit to OSS-Fuzz for #2404
Patater Apr 8, 2019
91c6030
generate_errors.pl: add mbedtls header shadowing by crypto headers
AndrzejKurek Apr 9, 2019
da84e32
Extend abi-checking to different repos
dgreen-arm Feb 19, 2019
c2883a2
Add option to skip identifiers in ABI checks
dgreen-arm Feb 20, 2019
e62f9bb
Add option for a brief report of problems only
dgreen-arm Feb 21, 2019
3d3d552
Simplify logic for checking if report folder can be removed
dgreen-arm Feb 25, 2019
9f357d6
Extend functionality to allow setting crypto submodule version
dgreen-arm Feb 25, 2019
3e7a980
Add handling for cases when not all .so files are present
dgreen-arm Feb 27, 2019
4831145
Add ability to compare submodules from different repositories
dgreen-arm Feb 27, 2019
ddf25a6
Only build the library
dgreen-arm Feb 28, 2019
c5132ff
Use optional arguments for setting repositories
dgreen-arm Mar 1, 2019
4cde8a0
Improve documentation
dgreen-arm Mar 5, 2019
e29ce70
Reduce indentation levels
dgreen-arm Mar 5, 2019
7c1a733
Add RepoVersion class to make handling of many arguments easier
dgreen-arm Mar 5, 2019
3a5f6c8
Prefix internal functions with underscore
dgreen-arm Mar 5, 2019
1d95c53
Fetch the remote crypto branch, rather than cloning it
dgreen-arm Mar 8, 2019
3c3da79
Add verbose switch to silence all output except the final report
dgreen-arm Mar 8, 2019
fe9a675
Don't put abi dumps in subfolders
dgreen-arm Apr 4, 2019
8184df5
Fix pylint issues
dgreen-arm Apr 5, 2019
0d1ca51
Use namespaces instead of full classes
dgreen-arm Apr 9, 2019
df48efa
Skip uncritical unsupported extensions
Apr 8, 2019
4c8c7aa
Don't use debug level 1 for informational messages
Apr 10, 2019
7346b31
Fix CMake build error on Cygwin and minGW platforms
geesun Feb 21, 2019
4b31761
Run ssl-opt.sh on 32-bit runtime
gilles-peskine-arm Apr 8, 2019
7832c9f
Add an "out-of-box" component
gilles-peskine-arm Apr 8, 2019
f1349e4
Clarify comment mangled by an earlier refactoring
gilles-peskine-arm Apr 8, 2019
492bc40
Check that the report directory is a directory
dgreen-arm Apr 11, 2019
9b11af4
revert changes to generate_features.pl and generate_query_config.pl
AndrzejKurek Apr 12, 2019
e90205f
generate_errors.pl: typo fix
AndrzejKurek Apr 12, 2019
f67e349
Correct documentation
dgreen-arm Apr 12, 2019
f025d53
Start unused variable with underscore
dgreen-arm Apr 12, 2019
463f049
generate_errors.pl: refactor and simplify the code
AndrzejKurek Apr 12, 2019
021dc3f
generate_visualc_files.pl: add mbedtls source shadowing by crypto
AndrzejKurek Apr 12, 2019
2ae29ba
cpp_dummy_build: Add missing header psa_util.h
pkolbus Apr 14, 2019
e6d5a50
Merge remote-tracking branch 'origin/pr/2558' into development
Patater Apr 15, 2019
e823416
Add certificate policy oid x509 extension
Apr 3, 2019
685a398
Minor fixes in get certificate policies oid test
Apr 3, 2019
3b4f9ea
Update crypto submodule
Apr 16, 2019
139ec3b
Don't call mbedtls_cipher_setkey twice
gilles-peskine-arm Apr 16, 2019
bc195a9
Merge remote-tracking branch 'origin/pr/2474' into development
Patater Apr 16, 2019
137c5b7
Merge remote-tracking branch 'origin/pr/2477' into development
Patater Apr 16, 2019
24c71d3
Merge remote-tracking branch 'origin/pr/2502' into development
Patater Apr 16, 2019
ff34d43
Merge remote-tracking branch 'origin/pr/2532' into development
Patater Apr 16, 2019
fe71067
Merge remote-tracking branch 'origin/pr/2539' into development
Patater Apr 16, 2019
424840e
Call mbedtls_cipher_free() to reset a cipher context
gilles-peskine-arm Apr 16, 2019
ef42847
Merge remote-tracking branch 'origin/pr/2552' into development
Patater Apr 16, 2019
d4d20ad
Merge remote-tracking branch 'origin/pr/2555' into development
Patater Apr 16, 2019
7a1c4eb
Merge remote-tracking branch 'origin/pr/2567' into development
Patater Apr 16, 2019
c41a328
Merge remote-tracking branch 'origin/pr/2559' into development
Patater Apr 16, 2019
ceb1370
Merge remote-tracking branch 'origin/pr/2580' into development
Patater Apr 16, 2019
5c7915b
Merge remote-tracking branch 'origin/pr/2582' into development
Patater Apr 17, 2019
f790a6c
Merge remote-tracking branch 'origin/pr/2536' into development
Patater Apr 17, 2019
521dbc6
Merge remote-tracking branch 'tls/development' into development
Patater Apr 17, 2019
117b8a4
all.sh: Require i686-w64-mingw32-gcc version >= 6
Patater Apr 17, 2019
b2ee0b8
Use check_output instead of Popen
dgreen-arm Apr 12, 2019
d832f18
Remove pkcs11-helper option
Patater Feb 26, 2019
d874a1f
Remove zlib
Patater Feb 26, 2019
1ae4886
Document the scripts behaviour further
dgreen-arm Apr 18, 2019
3956a84
Merge remote-tracking branch 'origin/pr/2092' into development
Patater Apr 24, 2019
2c8d949
Merge remote-tracking branch 'origin/pr/2480' into development
Patater Apr 24, 2019
1439b09
Merge remote-tracking branch 'origin/pr/2540' into development
Patater Apr 24, 2019
5c03c65
Merge remote-tracking branch 'origin/pr/2547' into development
Patater Apr 24, 2019
9679cb4
Merge remote-tracking branch 'origin/pr/2549' into development
Patater Apr 24, 2019
1cd7bea
Merge remote-tracking branch 'origin/pr/2586' into development
Patater Apr 24, 2019
0688e4f
Remove programs that depend on TLS or X.509
Patater Nov 2, 2018
986a151
programs, tests: Depend only on libmbedcrypto
Patater Nov 2, 2018
8298d70
Only build libmbedcrypto
Patater Nov 2, 2018
1ad3730
Remove irrelevant configs
Patater Feb 21, 2019
7fcc7bc
check-names: Enable referencing Mbed TLS macros
Patater Feb 26, 2019
1c66e48
config: Remove TLS and NET options
Patater Nov 2, 2018
bb1f701
config: Remove X.509 options
Patater Nov 2, 2018
a4308b2
Remove unused TLS, NET, and X.509 files
Patater Nov 2, 2018
b58ff95
scripts: Remove dependency on TLS
Patater Feb 21, 2019
43a450c
scripts: Remove dependency on X.509
Patater Feb 21, 2019
356acc8
scripts: Remove dependency on NET
Patater Feb 21, 2019
ef24980
Remove unused test data files
Patater Feb 21, 2019
ed05b29
scripts: Remove unneeded scripts
Patater Feb 21, 2019
3257773
doxygen: Update for Mbed Crypto
Patater Feb 22, 2019
dfcf84a
tests: Update generator with Mbed Crypto comments
Patater Feb 27, 2019
8cedaec
Remove ChangeLog
Patater Dec 20, 2018
7242ea6
config: Remove explicit ciphersuite lists
Patater Apr 10, 2019
7accf44
config: Simplify incorrect GCM comment
Patater Apr 10, 2019
651ae68
config: Enable using ARIA-GCM without other ciphers
Patater Apr 10, 2019
88aaf65
Remove key length field from ssl_transform
Dec 27, 2017
e694c3e
Remove ciphersuite_info from ssl_transform
Dec 27, 2017
52344c2
Correct space needed for MAC in case of NULL cipher
Jan 3, 2018
34f88af
Fix definition of SSL_SOME_MODES_USE_MAC
Jul 17, 2018
12a3a86
Add structure representing TLS records
Jan 5, 2018
d362dc5
Improve documentation of mbedtls_ssl_transform
Jan 3, 2018
9eddaeb
Provide standalone version of `ssl_encrypt_buf`
Dec 27, 2017
2e24c3b
Provide standalone version of `ssl_decrypt_buf`
Dec 27, 2017
8031d06
Remove code from `ssl_derive_keys` if relevant modes are not enabled
Jan 3, 2018
d56ed24
Reduce size of `ssl_transform` if no MAC ciphersuite is enabled
Jan 3, 2018
a18d132
Add tests for record encryption/decryption
Jan 3, 2018
b3268da
Add encryption/decryption tests for small records
Jan 5, 2018
1c0c37f
Move debugging output after record decryption
Aug 7, 2018
29800d2
Double check that record expansion is as expected during decryption
Aug 7, 2018
0db7e0c
Improve documentation of mbedtls_ssl_transform
Oct 18, 2018
d0fa2d7
Add record encryption/decryption tests for ARIA to SSL test suite
Oct 18, 2018
b2ca87d
Rename ssl_decrypt_buf() to mbedtls_ssl_decrypt_buf() in comment
Oct 18, 2018
81e16a3
Fix memory leak on failure in test_suite_ssl
Mar 1, 2019
907ab20
Alternative between send/recv transform in SSL record test suite
Mar 1, 2019
78f839d
Adapt record length value after encryption
Mar 14, 2019
cd430bc
Improve documentation of mbedtls_record
Apr 4, 2019
3ee5421
Use mbedtls_{calloc|free}() in SSL unit test suite
Apr 4, 2019
a5780f1
Catch errors while building SSL test transforms
Apr 5, 2019
78d1f70
Ensure non-NULL key buffer when building SSL test transforms
Apr 5, 2019
22bf145
Adapt PSA code to ssl_transform changes
Apr 5, 2019
1f10d76
Fix uninitialized variable access in debug output of record enc/dec
Apr 26, 2019
8df5de4
Makefile: Output to explicit target
Patater Apr 26, 2019
92da0bd
Makefile: Use generated source files from parent
Patater Apr 26, 2019
18d4789
CMake: Use generated source files from parent
Patater Apr 26, 2019
b978282
Merge pull request #97 from Patater/tls-generated-sources
Patater Apr 29, 2019
d29db1f
Makefile: Remove extra debug print
Patater Apr 29, 2019
5900ed6
Merge pull request #99 from Patater/tls-generated-sources-debug-print
Patater Apr 30, 2019
461fd58
Merge pull request #71 from Patater/remove-non-crypto
Patater Apr 30, 2019
182b0b9
Add test for ECP multiplication
yanesca Apr 26, 2019
05a708f
Add negative tests for Curve25519
yanesca Apr 26, 2019
af35383
crypto: Update to Mbed Crypto 461fd58fb2f5
Patater Apr 30, 2019
4e952f6
Regenerate errors.c
Patater Apr 25, 2019
e343505
Merge remote-tracking branch 'origin/pr/2473' into development
Patater May 1, 2019
0804b1d
Merge remote-tracking branch 'origin/pr/2617' into development
Patater May 1, 2019
7b3603c
Merge remote-tracking branch 'tls/development' into development
Patater May 1, 2019
aa2e298
Merge pull request #100 from Patater/tls-development-20190501
Patater May 1, 2019
75d9a33
Merge remote-tracking branch 'origin/pr/1633' into development
Patater May 2, 2019
8bf196b
Merge pull request #98 from yanesca/curve25519_negative_tests
Patater May 2, 2019
d8cf464
Add a link to the seedfile for out-of-tree cmake builds
AndrzejKurek May 6, 2019
5d9c963
Add support for RSA PKCSv1.5 signatures using RIPEMD-160
jack-fortanix May 1, 2019
5ed7fff
Add a test of the OID->MD map functions
jack-fortanix May 6, 2019
3ded1c8
Test the return value in the OID->X.509 map functions
jack-fortanix May 6, 2019
b2dc3fa
Suppport otherName of type hardware module name
Mar 21, 2019
74d9acc
Add support for certificate policies extension
Mar 21, 2019
226991e
Add ChangeLog entry for new extensions change
Mar 24, 2019
3c4734a
Add Wisun Fan device certificate
Mar 25, 2019
5091bec
Fix doxygen for new x509 structures
yanesca May 8, 2019
11b41eb
Fix typos in x509_crt.h
yanesca May 8, 2019
d2dba36
Only use submodule if present
dgreen-arm May 9, 2019
ab23cd1
Remove unneeded checks from x509_get_other_name
yanesca May 9, 2019
22f605f
Print unparseable SubjectAlternativeNames
yanesca May 10, 2019
2f0ec1e
Tidy up style in x509_info_subject_alt_name
yanesca May 10, 2019
6c379b4
Propogate error when parsing SubjectAltNames
yanesca May 10, 2019
293c3da
Remove redundant memset()
yanesca May 10, 2019
26cfd13
Rephrase changeLog entries
May 13, 2019
78c3040
Rephrase x509_crt extension member description
May 13, 2019
0806379
Add length checking in certificate policy parsing
May 13, 2019
890819a
Change mbedtls_x509_subject_alternative_name
May 13, 2019
f05f594
change the type of hardware_module_name member
May 13, 2019
81f9539
Merge pull request #105 from ARMmbed/test-link-seedfile-02
Patater May 14, 2019
cc45cd1
Update SAN parsing documentation
May 15, 2019
8b0c3c9
Fail in case critical crt policy not supported
May 15, 2019
e699270
Add a single exit point in key derivation function
May 7, 2019
a9f9a73
Zeroize secret data in the exit point
May 7, 2019
3b35085
Have the temporary buffer allocated dynamically
May 7, 2019
f5cc10d
Add an extra key export function
May 7, 2019
c4d3ef4
Add ChangeLog entry
May 7, 2019
b7fd64c
Add eap-tls key derivation in the examples.
May 12, 2019
51d3ab5
Add public API for tls_prf
May 12, 2019
824ad7b
Add tests for the public tls_prf API
May 13, 2019
cf28009
Add function to retrieve the tls_prf type
May 14, 2019
f75e252
Add test for export keys functionality
May 14, 2019
780d815
Add changeLog entry
May 14, 2019
aa947f1
Fix ChangeLog entry location
May 15, 2019
0810f0b
Fix typo
May 15, 2019
d2f25f7
Fix missing tls version test failures
May 15, 2019
2e06a9f
Fix ChangeLog entry
May 15, 2019
c8b5f3f
Documentation fixes
May 15, 2019
dbbd966
Check that SAN is not malformed when parsing
May 15, 2019
6b9b1b8
Initialize psa_crypto in ssl test
May 15, 2019
801faf0
Fix mingw CI failures
May 15, 2019
51c4507
Remove unneeded whitespaces
May 15, 2019
e269537
Add ChangeLog entry about listing all SAN
May 16, 2019
a291391
Fix minor issues
May 16, 2019
11818f2
Add some negative test cases
May 16, 2019
8a59d6b
Update test data
May 19, 2019
76a9c4a
Fix test data
May 20, 2019
6aeae9e
Style fix
May 20, 2019
642cc82
Merge remote-tracking branch 'origin/pr/2465' into development
Patater May 14, 2019
6a042fe
Merge remote-tracking branch 'origin/pr/2636' into development
Patater May 14, 2019
fc4596f
Merge remote-tracking branch 'origin/pr/2624' into development
Patater May 16, 2019
9ebcf9b
Merge remote-tracking branch 'origin/pr/2538' into development
Patater May 20, 2019
31d1432
Merge remote-tracking branch 'origin/pr/2530' into development
Patater May 20, 2019
3d07ffa
Merge remote-tracking branch 'tls/development' into development
Patater May 21, 2019
d6f371b
Keys may allow a second algorithm
gilles-peskine-arm May 10, 2019
ca5bed7
Align test functions to usage/alg parameter order
gilles-peskine-arm May 13, 2019
536e205
New macro to get the bit size of an elliptic curve
gilles-peskine-arm May 13, 2019
2c86ebc
EC key pair import: check the buffer size
gilles-peskine-arm May 13, 2019
cbce4d8
Persistent key reload: test more metadata
gilles-peskine-arm May 13, 2019
6fbfdb9
Enrollment algorithm in policy: test persistent keys
gilles-peskine-arm May 13, 2019
81efb39
Enrollment algorithm in policy: implement persistent keys
gilles-peskine-arm May 13, 2019
468c96c
Enrollment algorithm in policy: update persistent key tests
gilles-peskine-arm May 14, 2019
640273a
Update key file format information for 1.0.0
gilles-peskine-arm May 20, 2019
131aa31
New key file format for 1.0.1
gilles-peskine-arm May 20, 2019
705cbfd
Enrollment algorithm in policy: add support in psa_copy_key tests
gilles-peskine-arm May 20, 2019
52315e4
Enrollment algorithm in policy: add tests of psa_copy_key
gilles-peskine-arm May 20, 2019
7a91ece
Update link to PSA Crypto API HTML
gilles-peskine-arm May 21, 2019
549ea86
Minor documentation improvements
gilles-peskine-arm May 22, 2019
496c176
Merge pull request #266 from ARMmbed/psa-policy_alg2-poc
Patater May 22, 2019
0cad4ba
Merge pull request #123 from gilles-peskine-arm/api-link-index
Patater May 22, 2019
8d4d4f5
Makefile: Use full paths to refer to parent files
Patater May 22, 2019
8907b01
Merge pull request #124 from Patater/full-parent-paths
Patater May 22, 2019
58501e5
API spec PDF: link to the actual PDF
gilles-peskine-arm May 23, 2019
f81f87f
API spec HTML: Use Github Pages rather than htmlpreview
gilles-peskine-arm May 23, 2019
f479aae
Merge pull request #125 from gilles-peskine-arm/readme-fix-api-links
Patater May 24, 2019
2938268
Merge remote-tracking branch 'upstream-crypto/development' into psa-a…
gilles-peskine-arm May 29, 2019
6f3c30e
Merge follow-up: remove unused code from the development branch
gilles-peskine-arm May 27, 2019
0bbad74
Switch script to Python3
gilles-peskine-arm May 27, 2019
9d4d750
Add a bit of documentation
gilles-peskine-arm May 27, 2019
42a0a0a
Obey Python naming and method structure conventions
gilles-peskine-arm May 27, 2019
54f5445
Pacify Pylint
gilles-peskine-arm May 27, 2019
a3b93ff
Make docstring style consistent
gilles-peskine-arm Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 22 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
# Random seed file created by test scripts and sample programs
seedfile

# CMake build artifacts:
CMakeCache.txt
CMakeFiles
CTestTestfile.cmake
cmake_install.cmake
Testing
# CMake generates *.dir/ folders for in-tree builds (used by MSVC projects), ignore all of those:
*.dir/
# MSVC files generated by CMake:
/*.sln
/*.vcxproj
/*.filters

# Test coverage build artifacts:
Coverage
*.gcno
*.gcda

# generated by scripts/memory.sh
massif-*

# MSVC files generated by CMake:
/*.sln
/*.vcxproj
/*.filters

# MSVC build artifacts:
*.exe
*.pdb
Expand All @@ -24,5 +31,13 @@ massif-*
# Python build artifacts:
*.pyc

# CMake generates *.dir/ folders for in-tree builds (used by MSVC projects), ignore all of those:
*.dir/
# Generated documentation:
/apidoc

# Editor navigation files:
/GPATH
/GRTAGS
/GSYMS
/GTAGS
/TAGS
/tags
3 changes: 3 additions & 0 deletions .globalrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
default:\
:langmap=c\:.c.h.function:\

Loading