David Brown 85537fa141 psa: ecdsa: Resolve incorrect merge resolution ...

The commit
    commit dcdde59c6f3a4cedc3e3e51d73970bfc6ec1a2d7
    Author: David Brown <david.brown@linaro.org>
    Date:   Tue Feb 23 15:48:13 2021 -0700

        tests: psa: Change Elliptic curve defines to PSA names

when rebased on

    commit bb9cbc7a23c117437e3ef58076da76601053caf4
    Author: Ronald Cron <ronald.cron@arm.com>
    Date:   Thu Mar 4 17:09:00 2021 +0100

        psa: ecdsa: Prefer NOT_SUPPORTED error code

had an incorrect merge conflict resolution.  Correct this, allowing the
test "PSA sign: invalid algorithm for ECC key" to pass again.

Signed-off-by: David Brown <david.brown@linaro.org>

2021-03-12 12:21:45 -07:00

..

.jenkins

Add a Jenkinsfile for PR job testing

2018-10-19 16:41:54 +01:00

configs

Update copyright notices to use Linux Foundation guidance

2020-08-19 10:35:41 +02:00

data_files

Merge pull request #3698 from darrenkrahn/development

2021-01-17 18:06:18 +00:00

docker/bionic

Update copyright notices to use Linux Foundation guidance

2020-08-19 10:35:41 +02:00

git-scripts

Update copyright notices to use Linux Foundation guidance

2020-08-19 10:35:41 +02:00

include/test

Merge pull request #4151 from ronald-cron-arm/psa-sign_verify-hash

2021-03-10 10:08:50 +01:00

scripts

Merge pull request #4151 from ronald-cron-arm/psa-sign_verify-hash

2021-03-10 10:08:50 +01:00

src

Merge pull request #4151 from ronald-cron-arm/psa-sign_verify-hash

2021-03-10 10:08:50 +01:00

suites

psa: ecdsa: Resolve incorrect merge resolution

2021-03-12 12:21:45 -07:00

.gitignore

Apply feedback from PR review

2020-09-07 14:01:52 +02:00

CMakeLists.txt

New test suite: net

2021-02-24 18:37:46 +01:00

compat-in-docker.sh

Update copyright notices to use Linux Foundation guidance

2020-08-19 10:35:41 +02:00

compat.sh

Fix printf escape errors in shell scripts

2020-08-26 22:54:19 +02:00

context-info.sh

Merge pull request #3614 from gilles-peskine-arm/ssl-opt-gnutls-printf-development

2020-11-04 17:55:42 +01:00

Descriptions.txt

Revert "Remove tests that depend on TLS or X.509"

2020-03-19 14:17:54 +01:00

make-in-docker.sh

Update copyright notices to use Linux Foundation guidance

2020-08-19 10:35:41 +02:00

Makefile

Explain the explicit dependency on instrument_record_status.h

2021-01-25 13:46:14 +01:00

ssl-opt-in-docker.sh

Update copyright notices to use Linux Foundation guidance

2020-08-19 10:35:41 +02:00

ssl-opt.sh

Merge pull request #4136 from daverodgman/ssl-opt-gnutls-priority

2021-02-16 14:37:51 +00:00