AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
0892d0fbbf
mbedtls/visualc/VS2010
History
Gilles Peskine 72c8c5b352 Merge remote-tracking branch 'upstream-crypto/development' into psa-api-1.0-beta-merge_development_20190801 
Conflict resolution:
* `scripts/config.pl`:
  Take the exclusion of `MBEDTLS_PSA_CRYPTO_SE_C` from the API branch.
  Take the removal of `MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C` (obsolete) from
  the development branch.
* `tests/scripts/all.sh`:
  Multiple instances of factoring a sequence of `config.pl` calls into
  a mere `config.pl baremetal` in the development branch, and a change in
  the composition of `baremetal` in the API branch. In each case, take the
  version from development.
* `tests/suites/test_suite_psa_crypto_slot_management.function`:
  A function became non-static in development and disappeared in the API
  branch. Keep the version from the API branch. Functions need to be
  non-static if they're defined but unused in some configurations,
  which is not the case for any function in this file at the moment.
* `tests/suites/test_suite_psa_crypto.function`:
  Consecutive changes in the two branches, reconciled.
2019-07-31 17:47:49 +02:00
..
aescrypt2.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
benchmark.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
crypt_and_hash.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
crypto_examples.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
dh_genprime.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
ecdh_curve25519.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
ecdsa.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
gen_entropy.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
gen_key.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
gen_random_ctr_drbg.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
gen_random_havege.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
generic_sum.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
hello.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
key_app_writer.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
key_app.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
key_ladder_demo.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
mbedTLS.sln Remove programs that depend on TLS or X.509 2019-04-25 11:46:08 +01:00
mbedTLS.vcxproj Merge remote-tracking branch 'upstream-crypto/development' into psa-api-1.0-beta-merge_development_20190801 2019-07-31 17:47:49 +02:00
mpi_demo.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
pem2der.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
pk_decrypt.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
pk_encrypt.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
pk_sign.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
pk_verify.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
psa_constant_names.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
query_compile_time_config.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
rsa_decrypt.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
rsa_encrypt.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
rsa_genkey.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
rsa_sign_pss.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
rsa_sign.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
rsa_verify_pss.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
rsa_verify.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
selftest.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
strerror.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00
zeroize.vcxproj Merge remote-tracking branch 'tls/development' into development 2019-07-31 10:37:53 +01:00