Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 1 | /* |
| 2 | * Public Key abstraction layer: wrapper functions |
| 3 | * |
Bence Szépkúti | 1e14827 | 2020-08-07 13:07:28 +0200 | [diff] [blame] | 4 | * Copyright The Mbed TLS Contributors |
Dave Rodgman | 16799db | 2023-11-02 19:47:20 +0000 | [diff] [blame] | 5 | * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 6 | */ |
| 7 | |
Gilles Peskine | db09ef6 | 2020-06-03 01:43:33 +0200 | [diff] [blame] | 8 | #include "common.h" |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 9 | |
Gilles Peskine | 8a6022e | 2022-10-04 23:01:59 +0200 | [diff] [blame] | 10 | #include "mbedtls/platform_util.h" |
| 11 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 12 | #if defined(MBEDTLS_PK_C) |
Chris Jones | daacb59 | 2021-03-09 17:03:29 +0000 | [diff] [blame] | 13 | #include "pk_wrap.h" |
Valerio Setti | a1b8af6 | 2023-05-17 15:34:57 +0200 | [diff] [blame] | 14 | #include "pk_internal.h" |
Janos Follath | 24eed8d | 2019-11-22 13:21:35 +0000 | [diff] [blame] | 15 | #include "mbedtls/error.h" |
Valerio Setti | 384fbde | 2024-01-02 13:26:40 +0100 | [diff] [blame] | 16 | #include "mbedtls/psa_util.h" |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 17 | |
Manuel Pégourié-Gonnard | e511ffc | 2013-08-22 17:33:21 +0200 | [diff] [blame] | 18 | /* Even if RSA not activated, for the sake of RSA-alt */ |
Manuel Pégourié-Gonnard | 7f80997 | 2015-03-09 17:05:11 +0000 | [diff] [blame] | 19 | #include "mbedtls/rsa.h" |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 20 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 21 | #if defined(MBEDTLS_ECP_C) |
Manuel Pégourié-Gonnard | 7f80997 | 2015-03-09 17:05:11 +0000 | [diff] [blame] | 22 | #include "mbedtls/ecp.h" |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 23 | #endif |
| 24 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 25 | #if defined(MBEDTLS_ECDSA_C) |
Manuel Pégourié-Gonnard | 7f80997 | 2015-03-09 17:05:11 +0000 | [diff] [blame] | 26 | #include "mbedtls/ecdsa.h" |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 27 | #endif |
| 28 | |
Manuel Pégourié-Gonnard | 3686771 | 2018-10-31 16:22:49 +0100 | [diff] [blame] | 29 | #if defined(MBEDTLS_USE_PSA_CRYPTO) |
Tomi Fontanilles | 1941af0 | 2023-12-14 21:48:52 +0200 | [diff] [blame] | 30 | #include "psa_util_internal.h" |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 31 | #include "psa/crypto.h" |
Gilles Peskine | 8a6022e | 2022-10-04 23:01:59 +0200 | [diff] [blame] | 32 | |
Tomi Fontanilles | 9f41770 | 2023-12-16 15:28:51 +0200 | [diff] [blame] | 33 | #if defined(MBEDTLS_RSA_C) |
| 34 | #include "pkwrite.h" |
Valerio Setti | 18dd000 | 2024-01-23 17:59:10 +0100 | [diff] [blame^] | 35 | #include "rsa_internal.h" |
Tomi Fontanilles | 9f41770 | 2023-12-16 15:28:51 +0200 | [diff] [blame] | 36 | #endif |
| 37 | |
Valerio Setti | 80d0798 | 2023-02-08 13:49:17 +0100 | [diff] [blame] | 38 | #if defined(MBEDTLS_PK_CAN_ECDSA_SOME) |
Gilles Peskine | 8a6022e | 2022-10-04 23:01:59 +0200 | [diff] [blame] | 39 | #include "mbedtls/asn1write.h" |
| 40 | #include "mbedtls/asn1.h" |
Manuel Pégourié-Gonnard | 3686771 | 2018-10-31 16:22:49 +0100 | [diff] [blame] | 41 | #endif |
Gilles Peskine | 8a6022e | 2022-10-04 23:01:59 +0200 | [diff] [blame] | 42 | #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
Manuel Pégourié-Gonnard | 3686771 | 2018-10-31 16:22:49 +0100 | [diff] [blame] | 43 | |
Manuel Pégourié-Gonnard | 7f80997 | 2015-03-09 17:05:11 +0000 | [diff] [blame] | 44 | #include "mbedtls/platform.h" |
Manuel Pégourié-Gonnard | 765db07 | 2013-08-14 15:00:27 +0200 | [diff] [blame] | 45 | |
Andres AG | 7284987 | 2017-01-19 11:24:33 +0000 | [diff] [blame] | 46 | #include <limits.h> |
Andres Amaya Garcia | 7c02c50 | 2017-08-04 13:32:15 +0100 | [diff] [blame] | 47 | #include <stdint.h> |
Gilles Peskine | 8a6022e | 2022-10-04 23:01:59 +0200 | [diff] [blame] | 48 | #include <string.h> |
Paul Bakker | 3461772 | 2014-06-13 17:20:13 +0200 | [diff] [blame] | 49 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 50 | #if defined(MBEDTLS_RSA_C) |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 51 | static int rsa_can_do(mbedtls_pk_type_t type) |
Manuel Pégourié-Gonnard | f18c3e0 | 2013-08-12 18:41:18 +0200 | [diff] [blame] | 52 | { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 53 | return type == MBEDTLS_PK_RSA || |
| 54 | type == MBEDTLS_PK_RSASSA_PSS; |
Manuel Pégourié-Gonnard | f18c3e0 | 2013-08-12 18:41:18 +0200 | [diff] [blame] | 55 | } |
| 56 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 57 | static size_t rsa_get_bitlen(mbedtls_pk_context *pk) |
Manuel Pégourié-Gonnard | f8c948a | 2013-08-12 19:45:32 +0200 | [diff] [blame] | 58 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 59 | const mbedtls_rsa_context *rsa = (const mbedtls_rsa_context *) pk->pk_ctx; |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 60 | return 8 * mbedtls_rsa_get_len(rsa); |
Manuel Pégourié-Gonnard | f8c948a | 2013-08-12 19:45:32 +0200 | [diff] [blame] | 61 | } |
| 62 | |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 63 | #if defined(MBEDTLS_USE_PSA_CRYPTO) |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 64 | static int rsa_verify_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 65 | const unsigned char *hash, size_t hash_len, |
| 66 | const unsigned char *sig, size_t sig_len) |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 67 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 68 | mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) pk->pk_ctx; |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 69 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
| 70 | psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; |
| 71 | mbedtls_svc_key_id_t key_id = MBEDTLS_SVC_KEY_ID_INIT; |
| 72 | psa_status_t status; |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 73 | int key_len; |
Neil Armstrong | 6baea78 | 2022-03-01 13:52:02 +0100 | [diff] [blame] | 74 | unsigned char buf[MBEDTLS_PK_RSA_PUB_DER_MAX_BYTES]; |
Valerio Setti | 18dd000 | 2024-01-23 17:59:10 +0100 | [diff] [blame^] | 75 | unsigned char *p = buf + sizeof(buf); |
Neil Armstrong | 82cf804 | 2022-03-03 12:30:59 +0100 | [diff] [blame] | 76 | psa_algorithm_t psa_alg_md = |
Manuel Pégourié-Gonnard | 2d6d993 | 2023-03-28 11:38:08 +0200 | [diff] [blame] | 77 | PSA_ALG_RSA_PKCS1V15_SIGN(mbedtls_md_psa_alg_from_type(md_alg)); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 78 | size_t rsa_len = mbedtls_rsa_get_len(rsa); |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 79 | |
Dave Rodgman | 2eab462 | 2023-10-05 13:30:37 +0100 | [diff] [blame] | 80 | #if SIZE_MAX > UINT_MAX |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 81 | if (md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len) { |
| 82 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 83 | } |
Dave Rodgman | 2eab462 | 2023-10-05 13:30:37 +0100 | [diff] [blame] | 84 | #endif |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 85 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 86 | if (sig_len < rsa_len) { |
| 87 | return MBEDTLS_ERR_RSA_VERIFY_FAILED; |
| 88 | } |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 89 | |
Valerio Setti | 18dd000 | 2024-01-23 17:59:10 +0100 | [diff] [blame^] | 90 | key_len = mbedtls_rsa_pubkey_write(rsa, buf, &p); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 91 | if (key_len <= 0) { |
| 92 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 93 | } |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 94 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 95 | psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_VERIFY_HASH); |
| 96 | psa_set_key_algorithm(&attributes, psa_alg_md); |
| 97 | psa_set_key_type(&attributes, PSA_KEY_TYPE_RSA_PUBLIC_KEY); |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 98 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 99 | status = psa_import_key(&attributes, |
| 100 | buf + sizeof(buf) - key_len, key_len, |
| 101 | &key_id); |
| 102 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 103 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 104 | goto cleanup; |
| 105 | } |
| 106 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 107 | status = psa_verify_hash(key_id, psa_alg_md, hash, hash_len, |
| 108 | sig, sig_len); |
| 109 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 110 | ret = PSA_PK_RSA_TO_MBEDTLS_ERR(status); |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 111 | goto cleanup; |
| 112 | } |
| 113 | ret = 0; |
| 114 | |
| 115 | cleanup: |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 116 | status = psa_destroy_key(key_id); |
| 117 | if (ret == 0 && status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 118 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 119 | } |
Neil Armstrong | a33280a | 2022-02-24 15:17:47 +0100 | [diff] [blame] | 120 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 121 | return ret; |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 122 | } |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 123 | #else /* MBEDTLS_USE_PSA_CRYPTO */ |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 124 | static int rsa_verify_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 125 | const unsigned char *hash, size_t hash_len, |
| 126 | const unsigned char *sig, size_t sig_len) |
Neil Armstrong | 52f41f8 | 2022-02-22 15:30:24 +0100 | [diff] [blame] | 127 | { |
Janos Follath | 24eed8d | 2019-11-22 13:21:35 +0000 | [diff] [blame] | 128 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 129 | mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) pk->pk_ctx; |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 130 | size_t rsa_len = mbedtls_rsa_get_len(rsa); |
Manuel Pégourié-Gonnard | 2abed84 | 2014-04-08 12:40:15 +0200 | [diff] [blame] | 131 | |
Dave Rodgman | 02a53d7 | 2023-09-28 17:17:07 +0100 | [diff] [blame] | 132 | #if SIZE_MAX > UINT_MAX |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 133 | if (md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len) { |
| 134 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 135 | } |
Dave Rodgman | 02a53d7 | 2023-09-28 17:17:07 +0100 | [diff] [blame] | 136 | #endif |
Andres AG | 7284987 | 2017-01-19 11:24:33 +0000 | [diff] [blame] | 137 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 138 | if (sig_len < rsa_len) { |
| 139 | return MBEDTLS_ERR_RSA_VERIFY_FAILED; |
| 140 | } |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 141 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 142 | if ((ret = mbedtls_rsa_pkcs1_verify(rsa, md_alg, |
| 143 | (unsigned int) hash_len, |
| 144 | hash, sig)) != 0) { |
| 145 | return ret; |
| 146 | } |
Manuel Pégourié-Gonnard | 2abed84 | 2014-04-08 12:40:15 +0200 | [diff] [blame] | 147 | |
Gilles Peskine | 5114d3e | 2018-03-30 07:12:15 +0200 | [diff] [blame] | 148 | /* The buffer contains a valid signature followed by extra data. |
| 149 | * We have a special error code for that so that so that callers can |
| 150 | * use mbedtls_pk_verify() to check "Does the buffer start with a |
| 151 | * valid signature?" and not just "Does the buffer contain a valid |
| 152 | * signature?". */ |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 153 | if (sig_len > rsa_len) { |
| 154 | return MBEDTLS_ERR_PK_SIG_LEN_MISMATCH; |
| 155 | } |
Manuel Pégourié-Gonnard | 2abed84 | 2014-04-08 12:40:15 +0200 | [diff] [blame] | 156 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 157 | return 0; |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 158 | } |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 159 | #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 160 | |
Tomi Fontanilles | 8174662 | 2023-07-16 13:06:06 +0300 | [diff] [blame] | 161 | #if defined(MBEDTLS_USE_PSA_CRYPTO) |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 162 | int mbedtls_pk_psa_rsa_sign_ext(psa_algorithm_t alg, |
| 163 | mbedtls_rsa_context *rsa_ctx, |
| 164 | const unsigned char *hash, size_t hash_len, |
| 165 | unsigned char *sig, size_t sig_size, |
| 166 | size_t *sig_len) |
Neil Armstrong | 9854568 | 2022-02-22 16:12:51 +0100 | [diff] [blame] | 167 | { |
Neil Armstrong | 9854568 | 2022-02-22 16:12:51 +0100 | [diff] [blame] | 168 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
| 169 | psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; |
| 170 | mbedtls_svc_key_id_t key_id = MBEDTLS_SVC_KEY_ID_INIT; |
| 171 | psa_status_t status; |
Neil Armstrong | 9854568 | 2022-02-22 16:12:51 +0100 | [diff] [blame] | 172 | int key_len; |
Sarvesh Bodakhe | 430a4f3 | 2023-07-27 14:51:25 +0530 | [diff] [blame] | 173 | unsigned char *buf = NULL; |
Valerio Setti | 18dd000 | 2024-01-23 17:59:10 +0100 | [diff] [blame^] | 174 | unsigned char *p; |
| 175 | |
Sarvesh Bodakhe | 430a4f3 | 2023-07-27 14:51:25 +0530 | [diff] [blame] | 176 | buf = mbedtls_calloc(1, MBEDTLS_PK_RSA_PRV_DER_MAX_BYTES); |
| 177 | if (buf == NULL) { |
| 178 | return MBEDTLS_ERR_PK_ALLOC_FAILED; |
| 179 | } |
Valerio Setti | 18dd000 | 2024-01-23 17:59:10 +0100 | [diff] [blame^] | 180 | p = buf + MBEDTLS_PK_RSA_PRV_DER_MAX_BYTES; |
Neil Armstrong | 9854568 | 2022-02-22 16:12:51 +0100 | [diff] [blame] | 181 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 182 | *sig_len = mbedtls_rsa_get_len(rsa_ctx); |
| 183 | if (sig_size < *sig_len) { |
Sarvesh Bodakhe | 430a4f3 | 2023-07-27 14:51:25 +0530 | [diff] [blame] | 184 | mbedtls_free(buf); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 185 | return MBEDTLS_ERR_PK_BUFFER_TOO_SMALL; |
| 186 | } |
Neil Armstrong | 9854568 | 2022-02-22 16:12:51 +0100 | [diff] [blame] | 187 | |
Valerio Setti | 18dd000 | 2024-01-23 17:59:10 +0100 | [diff] [blame^] | 188 | key_len = mbedtls_rsa_key_write(rsa_ctx, buf, &p); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 189 | if (key_len <= 0) { |
Sarvesh Bodakhe | 430a4f3 | 2023-07-27 14:51:25 +0530 | [diff] [blame] | 190 | mbedtls_free(buf); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 191 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 192 | } |
| 193 | psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_SIGN_HASH); |
| 194 | psa_set_key_algorithm(&attributes, alg); |
| 195 | psa_set_key_type(&attributes, PSA_KEY_TYPE_RSA_KEY_PAIR); |
Neil Armstrong | 9854568 | 2022-02-22 16:12:51 +0100 | [diff] [blame] | 196 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 197 | status = psa_import_key(&attributes, |
Sarvesh Bodakhe | 430a4f3 | 2023-07-27 14:51:25 +0530 | [diff] [blame] | 198 | buf + MBEDTLS_PK_RSA_PRV_DER_MAX_BYTES - key_len, key_len, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 199 | &key_id); |
| 200 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 201 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Neil Armstrong | 9854568 | 2022-02-22 16:12:51 +0100 | [diff] [blame] | 202 | goto cleanup; |
| 203 | } |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 204 | status = psa_sign_hash(key_id, alg, hash, hash_len, |
| 205 | sig, sig_size, sig_len); |
| 206 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 207 | ret = PSA_PK_RSA_TO_MBEDTLS_ERR(status); |
Neil Armstrong | 9854568 | 2022-02-22 16:12:51 +0100 | [diff] [blame] | 208 | goto cleanup; |
| 209 | } |
| 210 | |
| 211 | ret = 0; |
| 212 | |
| 213 | cleanup: |
Sarvesh Bodakhe | 430a4f3 | 2023-07-27 14:51:25 +0530 | [diff] [blame] | 214 | mbedtls_free(buf); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 215 | status = psa_destroy_key(key_id); |
| 216 | if (ret == 0 && status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 217 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 218 | } |
| 219 | return ret; |
Neil Armstrong | 9854568 | 2022-02-22 16:12:51 +0100 | [diff] [blame] | 220 | } |
Tomi Fontanilles | 8174662 | 2023-07-16 13:06:06 +0300 | [diff] [blame] | 221 | #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
Jerry Yu | 1d172a3 | 2022-03-12 19:12:05 +0800 | [diff] [blame] | 222 | |
| 223 | #if defined(MBEDTLS_USE_PSA_CRYPTO) |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 224 | static int rsa_sign_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 225 | const unsigned char *hash, size_t hash_len, |
| 226 | unsigned char *sig, size_t sig_size, size_t *sig_len, |
| 227 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Jerry Yu | 1d172a3 | 2022-03-12 19:12:05 +0800 | [diff] [blame] | 228 | { |
Jerry Yu | 1d172a3 | 2022-03-12 19:12:05 +0800 | [diff] [blame] | 229 | ((void) f_rng); |
| 230 | ((void) p_rng); |
Jerry Yu | 1d172a3 | 2022-03-12 19:12:05 +0800 | [diff] [blame] | 231 | |
Jerry Yu | bd1b327 | 2022-03-24 13:05:20 +0800 | [diff] [blame] | 232 | psa_algorithm_t psa_md_alg; |
Manuel Pégourié-Gonnard | 2d6d993 | 2023-03-28 11:38:08 +0200 | [diff] [blame] | 233 | psa_md_alg = mbedtls_md_psa_alg_from_type(md_alg); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 234 | if (psa_md_alg == 0) { |
| 235 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 236 | } |
Jerry Yu | 1d172a3 | 2022-03-12 19:12:05 +0800 | [diff] [blame] | 237 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 238 | return mbedtls_pk_psa_rsa_sign_ext(PSA_ALG_RSA_PKCS1V15_SIGN( |
| 239 | psa_md_alg), |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 240 | pk->pk_ctx, hash, hash_len, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 241 | sig, sig_size, sig_len); |
Jerry Yu | 1d172a3 | 2022-03-12 19:12:05 +0800 | [diff] [blame] | 242 | } |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 243 | #else /* MBEDTLS_USE_PSA_CRYPTO */ |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 244 | static int rsa_sign_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 245 | const unsigned char *hash, size_t hash_len, |
| 246 | unsigned char *sig, size_t sig_size, size_t *sig_len, |
| 247 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Manuel Pégourié-Gonnard | 8df2769 | 2013-08-21 10:34:38 +0200 | [diff] [blame] | 248 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 249 | mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) pk->pk_ctx; |
Hanno Becker | 6a1e7e5 | 2017-08-22 13:55:00 +0100 | [diff] [blame] | 250 | |
Dave Rodgman | 02a53d7 | 2023-09-28 17:17:07 +0100 | [diff] [blame] | 251 | #if SIZE_MAX > UINT_MAX |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 252 | if (md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len) { |
| 253 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 254 | } |
Dave Rodgman | 02a53d7 | 2023-09-28 17:17:07 +0100 | [diff] [blame] | 255 | #endif |
Andres AG | 7284987 | 2017-01-19 11:24:33 +0000 | [diff] [blame] | 256 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 257 | *sig_len = mbedtls_rsa_get_len(rsa); |
| 258 | if (sig_size < *sig_len) { |
| 259 | return MBEDTLS_ERR_PK_BUFFER_TOO_SMALL; |
| 260 | } |
Manuel Pégourié-Gonnard | 8df2769 | 2013-08-21 10:34:38 +0200 | [diff] [blame] | 261 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 262 | return mbedtls_rsa_pkcs1_sign(rsa, f_rng, p_rng, |
| 263 | md_alg, (unsigned int) hash_len, |
| 264 | hash, sig); |
Manuel Pégourié-Gonnard | 8df2769 | 2013-08-21 10:34:38 +0200 | [diff] [blame] | 265 | } |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 266 | #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
Manuel Pégourié-Gonnard | 8df2769 | 2013-08-21 10:34:38 +0200 | [diff] [blame] | 267 | |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 268 | #if defined(MBEDTLS_USE_PSA_CRYPTO) |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 269 | static int rsa_decrypt_wrap(mbedtls_pk_context *pk, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 270 | const unsigned char *input, size_t ilen, |
| 271 | unsigned char *output, size_t *olen, size_t osize, |
| 272 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 273 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 274 | mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) pk->pk_ctx; |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 275 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
| 276 | psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; |
| 277 | mbedtls_svc_key_id_t key_id = MBEDTLS_SVC_KEY_ID_INIT; |
| 278 | psa_status_t status; |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 279 | int key_len; |
Neil Armstrong | b556a42 | 2022-02-25 08:58:12 +0100 | [diff] [blame] | 280 | unsigned char buf[MBEDTLS_PK_RSA_PRV_DER_MAX_BYTES]; |
Valerio Setti | 18dd000 | 2024-01-23 17:59:10 +0100 | [diff] [blame^] | 281 | unsigned char *p = buf + sizeof(buf); |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 282 | |
| 283 | ((void) f_rng); |
| 284 | ((void) p_rng); |
| 285 | |
| 286 | #if !defined(MBEDTLS_RSA_ALT) |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 287 | if (rsa->padding != MBEDTLS_RSA_PKCS_V15) { |
| 288 | return MBEDTLS_ERR_RSA_INVALID_PADDING; |
| 289 | } |
Neil Armstrong | 8e80504 | 2022-03-16 15:30:31 +0100 | [diff] [blame] | 290 | #endif /* !MBEDTLS_RSA_ALT */ |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 291 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 292 | if (ilen != mbedtls_rsa_get_len(rsa)) { |
| 293 | return MBEDTLS_ERR_RSA_BAD_INPUT_DATA; |
| 294 | } |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 295 | |
Valerio Setti | 18dd000 | 2024-01-23 17:59:10 +0100 | [diff] [blame^] | 296 | key_len = mbedtls_rsa_key_write(rsa, buf, &p); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 297 | if (key_len <= 0) { |
| 298 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 299 | } |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 300 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 301 | psa_set_key_type(&attributes, PSA_KEY_TYPE_RSA_KEY_PAIR); |
| 302 | psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_DECRYPT); |
| 303 | psa_set_key_algorithm(&attributes, PSA_ALG_RSA_PKCS1V15_CRYPT); |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 304 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 305 | status = psa_import_key(&attributes, |
| 306 | buf + sizeof(buf) - key_len, key_len, |
| 307 | &key_id); |
| 308 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 309 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 310 | goto cleanup; |
| 311 | } |
| 312 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 313 | status = psa_asymmetric_decrypt(key_id, PSA_ALG_RSA_PKCS1V15_CRYPT, |
| 314 | input, ilen, |
| 315 | NULL, 0, |
| 316 | output, osize, olen); |
| 317 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 318 | ret = PSA_PK_RSA_TO_MBEDTLS_ERR(status); |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 319 | goto cleanup; |
| 320 | } |
| 321 | |
| 322 | ret = 0; |
| 323 | |
| 324 | cleanup: |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 325 | mbedtls_platform_zeroize(buf, sizeof(buf)); |
| 326 | status = psa_destroy_key(key_id); |
| 327 | if (ret == 0 && status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 328 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 329 | } |
Neil Armstrong | f1b564b | 2022-02-24 15:17:47 +0100 | [diff] [blame] | 330 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 331 | return ret; |
Neil Armstrong | 18f43c7 | 2022-02-09 15:32:45 +0100 | [diff] [blame] | 332 | } |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 333 | #else /* MBEDTLS_USE_PSA_CRYPTO */ |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 334 | static int rsa_decrypt_wrap(mbedtls_pk_context *pk, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 335 | const unsigned char *input, size_t ilen, |
| 336 | unsigned char *output, size_t *olen, size_t osize, |
| 337 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Manuel Pégourié-Gonnard | a2d3f22 | 2013-08-21 11:51:08 +0200 | [diff] [blame] | 338 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 339 | mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) pk->pk_ctx; |
Hanno Becker | 6a1e7e5 | 2017-08-22 13:55:00 +0100 | [diff] [blame] | 340 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 341 | if (ilen != mbedtls_rsa_get_len(rsa)) { |
| 342 | return MBEDTLS_ERR_RSA_BAD_INPUT_DATA; |
| 343 | } |
Manuel Pégourié-Gonnard | a2d3f22 | 2013-08-21 11:51:08 +0200 | [diff] [blame] | 344 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 345 | return mbedtls_rsa_pkcs1_decrypt(rsa, f_rng, p_rng, |
| 346 | olen, input, output, osize); |
Manuel Pégourié-Gonnard | a2d3f22 | 2013-08-21 11:51:08 +0200 | [diff] [blame] | 347 | } |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 348 | #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
Manuel Pégourié-Gonnard | a2d3f22 | 2013-08-21 11:51:08 +0200 | [diff] [blame] | 349 | |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 350 | #if defined(MBEDTLS_USE_PSA_CRYPTO) |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 351 | static int rsa_encrypt_wrap(mbedtls_pk_context *pk, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 352 | const unsigned char *input, size_t ilen, |
| 353 | unsigned char *output, size_t *olen, size_t osize, |
| 354 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 355 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 356 | mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) pk->pk_ctx; |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 357 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
| 358 | psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; |
| 359 | mbedtls_svc_key_id_t key_id = MBEDTLS_SVC_KEY_ID_INIT; |
| 360 | psa_status_t status; |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 361 | int key_len; |
Neil Armstrong | deb4bfb | 2022-02-25 08:58:12 +0100 | [diff] [blame] | 362 | unsigned char buf[MBEDTLS_PK_RSA_PUB_DER_MAX_BYTES]; |
Valerio Setti | 18dd000 | 2024-01-23 17:59:10 +0100 | [diff] [blame^] | 363 | unsigned char *p = buf + sizeof(buf); |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 364 | |
| 365 | ((void) f_rng); |
| 366 | ((void) p_rng); |
| 367 | |
| 368 | #if !defined(MBEDTLS_RSA_ALT) |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 369 | if (rsa->padding != MBEDTLS_RSA_PKCS_V15) { |
| 370 | return MBEDTLS_ERR_RSA_INVALID_PADDING; |
| 371 | } |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 372 | #endif |
| 373 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 374 | if (mbedtls_rsa_get_len(rsa) > osize) { |
| 375 | return MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE; |
| 376 | } |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 377 | |
Valerio Setti | 18dd000 | 2024-01-23 17:59:10 +0100 | [diff] [blame^] | 378 | key_len = mbedtls_rsa_pubkey_write(rsa, buf, &p); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 379 | if (key_len <= 0) { |
| 380 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 381 | } |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 382 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 383 | psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_ENCRYPT); |
| 384 | psa_set_key_algorithm(&attributes, PSA_ALG_RSA_PKCS1V15_CRYPT); |
| 385 | psa_set_key_type(&attributes, PSA_KEY_TYPE_RSA_PUBLIC_KEY); |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 386 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 387 | status = psa_import_key(&attributes, |
| 388 | buf + sizeof(buf) - key_len, key_len, |
| 389 | &key_id); |
| 390 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 391 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 392 | goto cleanup; |
| 393 | } |
| 394 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 395 | status = psa_asymmetric_encrypt(key_id, PSA_ALG_RSA_PKCS1V15_CRYPT, |
| 396 | input, ilen, |
| 397 | NULL, 0, |
| 398 | output, osize, olen); |
| 399 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 400 | ret = PSA_PK_RSA_TO_MBEDTLS_ERR(status); |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 401 | goto cleanup; |
| 402 | } |
| 403 | |
| 404 | ret = 0; |
| 405 | |
| 406 | cleanup: |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 407 | status = psa_destroy_key(key_id); |
| 408 | if (ret == 0 && status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 409 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 410 | } |
Neil Armstrong | 7dd3b20 | 2022-02-24 15:29:18 +0100 | [diff] [blame] | 411 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 412 | return ret; |
Neil Armstrong | 96a16a4 | 2022-02-10 10:40:11 +0100 | [diff] [blame] | 413 | } |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 414 | #else /* MBEDTLS_USE_PSA_CRYPTO */ |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 415 | static int rsa_encrypt_wrap(mbedtls_pk_context *pk, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 416 | const unsigned char *input, size_t ilen, |
| 417 | unsigned char *output, size_t *olen, size_t osize, |
| 418 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Manuel Pégourié-Gonnard | a2d3f22 | 2013-08-21 11:51:08 +0200 | [diff] [blame] | 419 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 420 | mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) pk->pk_ctx; |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 421 | *olen = mbedtls_rsa_get_len(rsa); |
Manuel Pégourié-Gonnard | a2d3f22 | 2013-08-21 11:51:08 +0200 | [diff] [blame] | 422 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 423 | if (*olen > osize) { |
| 424 | return MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE; |
| 425 | } |
Manuel Pégourié-Gonnard | a1efcb0 | 2014-11-08 17:08:08 +0100 | [diff] [blame] | 426 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 427 | return mbedtls_rsa_pkcs1_encrypt(rsa, f_rng, p_rng, |
| 428 | ilen, input, output); |
Manuel Pégourié-Gonnard | a2d3f22 | 2013-08-21 11:51:08 +0200 | [diff] [blame] | 429 | } |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 430 | #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
Manuel Pégourié-Gonnard | a2d3f22 | 2013-08-21 11:51:08 +0200 | [diff] [blame] | 431 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 432 | static int rsa_check_pair_wrap(mbedtls_pk_context *pub, mbedtls_pk_context *prv, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 433 | int (*f_rng)(void *, unsigned char *, size_t), |
| 434 | void *p_rng) |
Manuel Pégourié-Gonnard | 70bdadf | 2014-11-06 16:51:20 +0100 | [diff] [blame] | 435 | { |
Manuel Pégourié-Gonnard | 39be141 | 2021-06-15 11:29:26 +0200 | [diff] [blame] | 436 | (void) f_rng; |
| 437 | (void) p_rng; |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 438 | return mbedtls_rsa_check_pub_priv((const mbedtls_rsa_context *) pub->pk_ctx, |
| 439 | (const mbedtls_rsa_context *) prv->pk_ctx); |
Manuel Pégourié-Gonnard | 70bdadf | 2014-11-06 16:51:20 +0100 | [diff] [blame] | 440 | } |
| 441 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 442 | static void *rsa_alloc_wrap(void) |
Manuel Pégourié-Gonnard | 765db07 | 2013-08-14 15:00:27 +0200 | [diff] [blame] | 443 | { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 444 | void *ctx = mbedtls_calloc(1, sizeof(mbedtls_rsa_context)); |
Manuel Pégourié-Gonnard | 765db07 | 2013-08-14 15:00:27 +0200 | [diff] [blame] | 445 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 446 | if (ctx != NULL) { |
| 447 | mbedtls_rsa_init((mbedtls_rsa_context *) ctx); |
| 448 | } |
Manuel Pégourié-Gonnard | 765db07 | 2013-08-14 15:00:27 +0200 | [diff] [blame] | 449 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 450 | return ctx; |
Manuel Pégourié-Gonnard | 765db07 | 2013-08-14 15:00:27 +0200 | [diff] [blame] | 451 | } |
| 452 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 453 | static void rsa_free_wrap(void *ctx) |
Manuel Pégourié-Gonnard | 765db07 | 2013-08-14 15:00:27 +0200 | [diff] [blame] | 454 | { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 455 | mbedtls_rsa_free((mbedtls_rsa_context *) ctx); |
| 456 | mbedtls_free(ctx); |
Manuel Pégourié-Gonnard | 765db07 | 2013-08-14 15:00:27 +0200 | [diff] [blame] | 457 | } |
| 458 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 459 | static void rsa_debug(mbedtls_pk_context *pk, mbedtls_pk_debug_item *items) |
Manuel Pégourié-Gonnard | c6ac887 | 2013-08-14 18:04:18 +0200 | [diff] [blame] | 460 | { |
Gilles Peskine | 85b1bc6 | 2021-05-25 09:20:26 +0200 | [diff] [blame] | 461 | #if defined(MBEDTLS_RSA_ALT) |
| 462 | /* Not supported */ |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 463 | (void) pk; |
Gilles Peskine | 85b1bc6 | 2021-05-25 09:20:26 +0200 | [diff] [blame] | 464 | (void) items; |
| 465 | #else |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 466 | mbedtls_rsa_context *rsa = (mbedtls_rsa_context *) pk->pk_ctx; |
| 467 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 468 | items->type = MBEDTLS_PK_DEBUG_MPI; |
Manuel Pégourié-Gonnard | c6ac887 | 2013-08-14 18:04:18 +0200 | [diff] [blame] | 469 | items->name = "rsa.N"; |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 470 | items->value = &(rsa->N); |
Manuel Pégourié-Gonnard | c6ac887 | 2013-08-14 18:04:18 +0200 | [diff] [blame] | 471 | |
| 472 | items++; |
| 473 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 474 | items->type = MBEDTLS_PK_DEBUG_MPI; |
Manuel Pégourié-Gonnard | c6ac887 | 2013-08-14 18:04:18 +0200 | [diff] [blame] | 475 | items->name = "rsa.E"; |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 476 | items->value = &(rsa->E); |
Gilles Peskine | 85b1bc6 | 2021-05-25 09:20:26 +0200 | [diff] [blame] | 477 | #endif |
Manuel Pégourié-Gonnard | c6ac887 | 2013-08-14 18:04:18 +0200 | [diff] [blame] | 478 | } |
| 479 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 480 | const mbedtls_pk_info_t mbedtls_rsa_info = { |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 481 | .type = MBEDTLS_PK_RSA, |
| 482 | .name = "RSA", |
| 483 | .get_bitlen = rsa_get_bitlen, |
| 484 | .can_do = rsa_can_do, |
| 485 | .verify_func = rsa_verify_wrap, |
| 486 | .sign_func = rsa_sign_wrap, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 487 | #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) |
| 488 | .verify_rs_func = NULL, |
| 489 | .sign_rs_func = NULL, |
| 490 | .rs_alloc_func = NULL, |
| 491 | .rs_free_func = NULL, |
| 492 | #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 493 | .decrypt_func = rsa_decrypt_wrap, |
| 494 | .encrypt_func = rsa_encrypt_wrap, |
| 495 | .check_pair_func = rsa_check_pair_wrap, |
| 496 | .ctx_alloc_func = rsa_alloc_wrap, |
| 497 | .ctx_free_func = rsa_free_wrap, |
| 498 | .debug_func = rsa_debug, |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 499 | }; |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 500 | #endif /* MBEDTLS_RSA_C */ |
Manuel Pégourié-Gonnard | d73b3c1 | 2013-08-12 17:06:05 +0200 | [diff] [blame] | 501 | |
Valerio Setti | 81d7512 | 2023-06-14 14:49:33 +0200 | [diff] [blame] | 502 | #if defined(MBEDTLS_PK_HAVE_ECC_KEYS) |
Manuel Pégourié-Gonnard | 835eb59 | 2013-08-12 18:51:26 +0200 | [diff] [blame] | 503 | /* |
| 504 | * Generic EC key |
| 505 | */ |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 506 | static int eckey_can_do(mbedtls_pk_type_t type) |
Manuel Pégourié-Gonnard | f18c3e0 | 2013-08-12 18:41:18 +0200 | [diff] [blame] | 507 | { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 508 | return type == MBEDTLS_PK_ECKEY || |
| 509 | type == MBEDTLS_PK_ECKEY_DH || |
| 510 | type == MBEDTLS_PK_ECDSA; |
Manuel Pégourié-Gonnard | f18c3e0 | 2013-08-12 18:41:18 +0200 | [diff] [blame] | 511 | } |
| 512 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 513 | static size_t eckey_get_bitlen(mbedtls_pk_context *pk) |
Manuel Pégourié-Gonnard | f8c948a | 2013-08-12 19:45:32 +0200 | [diff] [blame] | 514 | { |
Valerio Setti | a1b8af6 | 2023-05-17 15:34:57 +0200 | [diff] [blame] | 515 | #if defined(MBEDTLS_PK_USE_PSA_EC_DATA) |
| 516 | return pk->ec_bits; |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 517 | #else /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 518 | mbedtls_ecp_keypair *ecp = (mbedtls_ecp_keypair *) pk->pk_ctx; |
| 519 | return ecp->grp.pbits; |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 520 | #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Manuel Pégourié-Gonnard | f8c948a | 2013-08-12 19:45:32 +0200 | [diff] [blame] | 521 | } |
| 522 | |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 523 | #if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY) |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 524 | #if defined(MBEDTLS_USE_PSA_CRYPTO) |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 525 | /* |
Andrzej Kurek | 9241d18 | 2018-11-20 05:04:35 -0500 | [diff] [blame] | 526 | * An ASN.1 encoded signature is a sequence of two ASN.1 integers. Parse one of |
| 527 | * those integers and convert it to the fixed-length encoding expected by PSA. |
Andrzej Kurek | b7b0478 | 2018-11-19 17:01:16 -0500 | [diff] [blame] | 528 | */ |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 529 | static int extract_ecdsa_sig_int(unsigned char **from, const unsigned char *end, |
| 530 | unsigned char *to, size_t to_len) |
Andrzej Kurek | b7b0478 | 2018-11-19 17:01:16 -0500 | [diff] [blame] | 531 | { |
Janos Follath | 24eed8d | 2019-11-22 13:21:35 +0000 | [diff] [blame] | 532 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
Andrzej Kurek | 9241d18 | 2018-11-20 05:04:35 -0500 | [diff] [blame] | 533 | size_t unpadded_len, padding_len; |
Andrzej Kurek | b7b0478 | 2018-11-19 17:01:16 -0500 | [diff] [blame] | 534 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 535 | if ((ret = mbedtls_asn1_get_tag(from, end, &unpadded_len, |
| 536 | MBEDTLS_ASN1_INTEGER)) != 0) { |
| 537 | return ret; |
Andrzej Kurek | b7b0478 | 2018-11-19 17:01:16 -0500 | [diff] [blame] | 538 | } |
| 539 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 540 | while (unpadded_len > 0 && **from == 0x00) { |
| 541 | (*from)++; |
Andrzej Kurek | 9241d18 | 2018-11-20 05:04:35 -0500 | [diff] [blame] | 542 | unpadded_len--; |
Andrzej Kurek | b7b0478 | 2018-11-19 17:01:16 -0500 | [diff] [blame] | 543 | } |
| 544 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 545 | if (unpadded_len > to_len || unpadded_len == 0) { |
| 546 | return MBEDTLS_ERR_ASN1_LENGTH_MISMATCH; |
| 547 | } |
Andrzej Kurek | b7b0478 | 2018-11-19 17:01:16 -0500 | [diff] [blame] | 548 | |
Andrzej Kurek | 9241d18 | 2018-11-20 05:04:35 -0500 | [diff] [blame] | 549 | padding_len = to_len - unpadded_len; |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 550 | memset(to, 0x00, padding_len); |
| 551 | memcpy(to + padding_len, *from, unpadded_len); |
| 552 | (*from) += unpadded_len; |
Andrzej Kurek | b7b0478 | 2018-11-19 17:01:16 -0500 | [diff] [blame] | 553 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 554 | return 0; |
Andrzej Kurek | b7b0478 | 2018-11-19 17:01:16 -0500 | [diff] [blame] | 555 | } |
| 556 | |
| 557 | /* |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 558 | * Convert a signature from an ASN.1 sequence of two integers |
Andrzej Kurek | 9241d18 | 2018-11-20 05:04:35 -0500 | [diff] [blame] | 559 | * to a raw {r,s} buffer. Note: the provided sig buffer must be at least |
Andrzej Kurek | b6016c5 | 2018-11-19 17:41:58 -0500 | [diff] [blame] | 560 | * twice as big as int_size. |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 561 | */ |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 562 | static int extract_ecdsa_sig(unsigned char **p, const unsigned char *end, |
| 563 | unsigned char *sig, size_t int_size) |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 564 | { |
Janos Follath | 24eed8d | 2019-11-22 13:21:35 +0000 | [diff] [blame] | 565 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
Andrzej Kurek | 9241d18 | 2018-11-20 05:04:35 -0500 | [diff] [blame] | 566 | size_t tmp_size; |
Andrzej Kurek | 3f864c2 | 2018-11-07 09:30:50 -0500 | [diff] [blame] | 567 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 568 | if ((ret = mbedtls_asn1_get_tag(p, end, &tmp_size, |
| 569 | MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) { |
| 570 | return ret; |
| 571 | } |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 572 | |
Andrzej Kurek | b7b0478 | 2018-11-19 17:01:16 -0500 | [diff] [blame] | 573 | /* Extract r */ |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 574 | if ((ret = extract_ecdsa_sig_int(p, end, sig, int_size)) != 0) { |
| 575 | return ret; |
| 576 | } |
Andrzej Kurek | b7b0478 | 2018-11-19 17:01:16 -0500 | [diff] [blame] | 577 | /* Extract s */ |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 578 | if ((ret = extract_ecdsa_sig_int(p, end, sig + int_size, int_size)) != 0) { |
| 579 | return ret; |
| 580 | } |
Andrzej Kurek | 3f864c2 | 2018-11-07 09:30:50 -0500 | [diff] [blame] | 581 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 582 | return 0; |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 583 | } |
| 584 | |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 585 | /* Common helper for ECDSA verify using PSA functions. */ |
Valerio Setti | ed7d6af | 2023-06-21 15:42:21 +0200 | [diff] [blame] | 586 | static int ecdsa_verify_psa(unsigned char *key, size_t key_len, |
| 587 | psa_ecc_family_t curve, size_t curve_bits, |
| 588 | const unsigned char *hash, size_t hash_len, |
| 589 | const unsigned char *sig, size_t sig_len) |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 590 | { |
Janos Follath | 24eed8d | 2019-11-22 13:21:35 +0000 | [diff] [blame] | 591 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
Gilles Peskine | d2d45c1 | 2019-05-27 14:53:13 +0200 | [diff] [blame] | 592 | psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; |
Andrzej Kurek | 03e0146 | 2022-01-03 12:53:24 +0100 | [diff] [blame] | 593 | mbedtls_svc_key_id_t key_id = MBEDTLS_SVC_KEY_ID_INIT; |
Valerio Setti | a1b8af6 | 2023-05-17 15:34:57 +0200 | [diff] [blame] | 594 | psa_algorithm_t psa_sig_md = PSA_ALG_ECDSA_ANY; |
Valerio Setti | ed7d6af | 2023-06-21 15:42:21 +0200 | [diff] [blame] | 595 | size_t signature_len = PSA_ECDSA_SIGNATURE_SIZE(curve_bits); |
| 596 | unsigned char extracted_sig[PSA_VENDOR_ECDSA_SIGNATURE_MAX_SIZE]; |
| 597 | unsigned char *p; |
| 598 | psa_status_t status; |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 599 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 600 | if (curve == 0) { |
| 601 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 602 | } |
Andrzej Kurek | b3d1b12 | 2018-11-07 08:18:52 -0500 | [diff] [blame] | 603 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 604 | psa_set_key_type(&attributes, PSA_KEY_TYPE_ECC_PUBLIC_KEY(curve)); |
| 605 | psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_VERIFY_HASH); |
| 606 | psa_set_key_algorithm(&attributes, psa_sig_md); |
Andrzej Kurek | 2349c4d | 2019-01-08 09:36:01 -0500 | [diff] [blame] | 607 | |
Valerio Setti | ed7d6af | 2023-06-21 15:42:21 +0200 | [diff] [blame] | 608 | status = psa_import_key(&attributes, key, key_len, &key_id); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 609 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 610 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 611 | goto cleanup; |
| 612 | } |
| 613 | |
Valerio Setti | ed7d6af | 2023-06-21 15:42:21 +0200 | [diff] [blame] | 614 | if (signature_len > sizeof(extracted_sig)) { |
Andrzej Kurek | b6016c5 | 2018-11-19 17:41:58 -0500 | [diff] [blame] | 615 | ret = MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 616 | goto cleanup; |
| 617 | } |
Andrzej Kurek | b6016c5 | 2018-11-19 17:41:58 -0500 | [diff] [blame] | 618 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 619 | p = (unsigned char *) sig; |
Valerio Setti | a1b8af6 | 2023-05-17 15:34:57 +0200 | [diff] [blame] | 620 | /* extract_ecdsa_sig's last parameter is the size |
Valerio Setti | f57007d | 2023-05-19 13:54:39 +0200 | [diff] [blame] | 621 | * of each integer to be parsed, so it's actually half |
Valerio Setti | a1b8af6 | 2023-05-17 15:34:57 +0200 | [diff] [blame] | 622 | * the size of the signature. */ |
Valerio Setti | ed7d6af | 2023-06-21 15:42:21 +0200 | [diff] [blame] | 623 | if ((ret = extract_ecdsa_sig(&p, sig + sig_len, extracted_sig, |
Valerio Setti | a1b8af6 | 2023-05-17 15:34:57 +0200 | [diff] [blame] | 624 | signature_len/2)) != 0) { |
Andrzej Kurek | b6016c5 | 2018-11-19 17:41:58 -0500 | [diff] [blame] | 625 | goto cleanup; |
| 626 | } |
| 627 | |
Valerio Setti | ed7d6af | 2023-06-21 15:42:21 +0200 | [diff] [blame] | 628 | status = psa_verify_hash(key_id, psa_sig_md, hash, hash_len, |
| 629 | extracted_sig, signature_len); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 630 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 631 | ret = PSA_PK_ECDSA_TO_MBEDTLS_ERR(status); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 632 | goto cleanup; |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 633 | } |
Andrzej Kurek | ad5d581 | 2018-11-20 07:59:18 -0500 | [diff] [blame] | 634 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 635 | if (p != sig + sig_len) { |
Andrzej Kurek | ad5d581 | 2018-11-20 07:59:18 -0500 | [diff] [blame] | 636 | ret = MBEDTLS_ERR_PK_SIG_LEN_MISMATCH; |
| 637 | goto cleanup; |
| 638 | } |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 639 | ret = 0; |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 640 | |
Andrzej Kurek | b7b0478 | 2018-11-19 17:01:16 -0500 | [diff] [blame] | 641 | cleanup: |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 642 | status = psa_destroy_key(key_id); |
| 643 | if (ret == 0 && status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 644 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 645 | } |
Neil Armstrong | 9dccd86 | 2022-02-24 15:33:13 +0100 | [diff] [blame] | 646 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 647 | return ret; |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 648 | } |
Valerio Setti | ed7d6af | 2023-06-21 15:42:21 +0200 | [diff] [blame] | 649 | |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 650 | static int ecdsa_opaque_verify_wrap(mbedtls_pk_context *pk, |
| 651 | mbedtls_md_type_t md_alg, |
| 652 | const unsigned char *hash, size_t hash_len, |
| 653 | const unsigned char *sig, size_t sig_len) |
Valerio Setti | e773077 | 2023-06-21 16:58:40 +0200 | [diff] [blame] | 654 | { |
| 655 | (void) md_alg; |
| 656 | unsigned char key[MBEDTLS_PK_MAX_EC_PUBKEY_RAW_LEN]; |
| 657 | size_t key_len; |
| 658 | psa_key_attributes_t key_attr = PSA_KEY_ATTRIBUTES_INIT; |
| 659 | psa_ecc_family_t curve; |
| 660 | size_t curve_bits; |
| 661 | psa_status_t status; |
| 662 | |
| 663 | status = psa_get_key_attributes(pk->priv_id, &key_attr); |
| 664 | if (status != PSA_SUCCESS) { |
| 665 | return PSA_PK_ECDSA_TO_MBEDTLS_ERR(status); |
| 666 | } |
| 667 | curve = PSA_KEY_TYPE_ECC_GET_FAMILY(psa_get_key_type(&key_attr)); |
| 668 | curve_bits = psa_get_key_bits(&key_attr); |
| 669 | psa_reset_key_attributes(&key_attr); |
| 670 | |
| 671 | status = psa_export_public_key(pk->priv_id, key, sizeof(key), &key_len); |
| 672 | if (status != PSA_SUCCESS) { |
| 673 | return PSA_PK_ECDSA_TO_MBEDTLS_ERR(status); |
| 674 | } |
| 675 | |
| 676 | return ecdsa_verify_psa(key, key_len, curve, curve_bits, |
| 677 | hash, hash_len, sig, sig_len); |
| 678 | } |
| 679 | |
Valerio Setti | ed7d6af | 2023-06-21 15:42:21 +0200 | [diff] [blame] | 680 | #if defined(MBEDTLS_PK_USE_PSA_EC_DATA) |
| 681 | static int ecdsa_verify_wrap(mbedtls_pk_context *pk, |
| 682 | mbedtls_md_type_t md_alg, |
| 683 | const unsigned char *hash, size_t hash_len, |
| 684 | const unsigned char *sig, size_t sig_len) |
| 685 | { |
| 686 | (void) md_alg; |
| 687 | psa_ecc_family_t curve = pk->ec_family; |
| 688 | size_t curve_bits = pk->ec_bits; |
| 689 | |
| 690 | return ecdsa_verify_psa(pk->pub_raw, pk->pub_raw_len, curve, curve_bits, |
| 691 | hash, hash_len, sig, sig_len); |
| 692 | } |
| 693 | #else /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
| 694 | static int ecdsa_verify_wrap(mbedtls_pk_context *pk, |
| 695 | mbedtls_md_type_t md_alg, |
| 696 | const unsigned char *hash, size_t hash_len, |
| 697 | const unsigned char *sig, size_t sig_len) |
| 698 | { |
| 699 | (void) md_alg; |
| 700 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
| 701 | mbedtls_ecp_keypair *ctx = pk->pk_ctx; |
| 702 | unsigned char key[MBEDTLS_PSA_MAX_EC_PUBKEY_LENGTH]; |
| 703 | size_t key_len; |
| 704 | size_t curve_bits; |
| 705 | psa_ecc_family_t curve = mbedtls_ecc_group_to_psa(ctx->grp.id, &curve_bits); |
| 706 | |
| 707 | ret = mbedtls_ecp_point_write_binary(&ctx->grp, &ctx->Q, |
| 708 | MBEDTLS_ECP_PF_UNCOMPRESSED, |
| 709 | &key_len, key, sizeof(key)); |
| 710 | if (ret != 0) { |
| 711 | return ret; |
| 712 | } |
| 713 | |
| 714 | return ecdsa_verify_psa(key, key_len, curve, curve_bits, |
| 715 | hash, hash_len, sig, sig_len); |
| 716 | } |
| 717 | #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 718 | #else /* MBEDTLS_USE_PSA_CRYPTO */ |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 719 | static int ecdsa_verify_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 720 | const unsigned char *hash, size_t hash_len, |
| 721 | const unsigned char *sig, size_t sig_len) |
Manuel Pégourié-Gonnard | 09162dd | 2013-08-14 18:16:50 +0200 | [diff] [blame] | 722 | { |
Janos Follath | 24eed8d | 2019-11-22 13:21:35 +0000 | [diff] [blame] | 723 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
Manuel Pégourié-Gonnard | f73da02 | 2013-08-17 14:36:32 +0200 | [diff] [blame] | 724 | ((void) md_alg); |
| 725 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 726 | ret = mbedtls_ecdsa_read_signature((mbedtls_ecdsa_context *) pk->pk_ctx, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 727 | hash, hash_len, sig, sig_len); |
Manuel Pégourié-Gonnard | 2abed84 | 2014-04-08 12:40:15 +0200 | [diff] [blame] | 728 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 729 | if (ret == MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH) { |
| 730 | return MBEDTLS_ERR_PK_SIG_LEN_MISMATCH; |
| 731 | } |
Manuel Pégourié-Gonnard | 2abed84 | 2014-04-08 12:40:15 +0200 | [diff] [blame] | 732 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 733 | return ret; |
Manuel Pégourié-Gonnard | 09162dd | 2013-08-14 18:16:50 +0200 | [diff] [blame] | 734 | } |
Andrzej Kurek | 8b036a6 | 2018-10-31 05:16:46 -0400 | [diff] [blame] | 735 | #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 736 | #endif /* MBEDTLS_PK_CAN_ECDSA_VERIFY */ |
Manuel Pégourié-Gonnard | 09162dd | 2013-08-14 18:16:50 +0200 | [diff] [blame] | 737 | |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 738 | #if defined(MBEDTLS_PK_CAN_ECDSA_SIGN) |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 739 | #if defined(MBEDTLS_USE_PSA_CRYPTO) |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 740 | /* |
| 741 | * Simultaneously convert and move raw MPI from the beginning of a buffer |
| 742 | * to an ASN.1 MPI at the end of the buffer. |
| 743 | * See also mbedtls_asn1_write_mpi(). |
| 744 | * |
| 745 | * p: pointer to the end of the output buffer |
| 746 | * start: start of the output buffer, and also of the mpi to write at the end |
| 747 | * n_len: length of the mpi to read from start |
| 748 | */ |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 749 | static int asn1_write_mpibuf(unsigned char **p, unsigned char *start, |
| 750 | size_t n_len) |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 751 | { |
| 752 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
| 753 | size_t len = 0; |
| 754 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 755 | if ((size_t) (*p - start) < n_len) { |
| 756 | return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL; |
| 757 | } |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 758 | |
| 759 | len = n_len; |
| 760 | *p -= len; |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 761 | memmove(*p, start, len); |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 762 | |
| 763 | /* ASN.1 DER encoding requires minimal length, so skip leading 0s. |
| 764 | * Neither r nor s should be 0, but as a failsafe measure, still detect |
| 765 | * that rather than overflowing the buffer in case of a PSA error. */ |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 766 | while (len > 0 && **p == 0x00) { |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 767 | ++(*p); |
| 768 | --len; |
| 769 | } |
| 770 | |
| 771 | /* this is only reached if the signature was invalid */ |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 772 | if (len == 0) { |
| 773 | return MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED; |
| 774 | } |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 775 | |
| 776 | /* if the msb is 1, ASN.1 requires that we prepend a 0. |
| 777 | * Neither r nor s can be 0, so we can assume len > 0 at all times. */ |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 778 | if (**p & 0x80) { |
| 779 | if (*p - start < 1) { |
| 780 | return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL; |
| 781 | } |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 782 | |
| 783 | *--(*p) = 0x00; |
| 784 | len += 1; |
| 785 | } |
| 786 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 787 | MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(p, start, len)); |
| 788 | MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(p, start, |
| 789 | MBEDTLS_ASN1_INTEGER)); |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 790 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 791 | return (int) len; |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 792 | } |
| 793 | |
| 794 | /* Transcode signature from PSA format to ASN.1 sequence. |
| 795 | * See ecdsa_signature_to_asn1 in ecdsa.c, but with byte buffers instead of |
| 796 | * MPIs, and in-place. |
| 797 | * |
| 798 | * [in/out] sig: the signature pre- and post-transcoding |
| 799 | * [in/out] sig_len: signature length pre- and post-transcoding |
| 800 | * [int] buf_len: the available size the in/out buffer |
| 801 | */ |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 802 | static int pk_ecdsa_sig_asn1_from_psa(unsigned char *sig, size_t *sig_len, |
| 803 | size_t buf_len) |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 804 | { |
| 805 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
| 806 | size_t len = 0; |
| 807 | const size_t rs_len = *sig_len / 2; |
| 808 | unsigned char *p = sig + buf_len; |
| 809 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 810 | MBEDTLS_ASN1_CHK_ADD(len, asn1_write_mpibuf(&p, sig + rs_len, rs_len)); |
| 811 | MBEDTLS_ASN1_CHK_ADD(len, asn1_write_mpibuf(&p, sig, rs_len)); |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 812 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 813 | MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(&p, sig, len)); |
| 814 | MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(&p, sig, |
| 815 | MBEDTLS_ASN1_CONSTRUCTED | |
| 816 | MBEDTLS_ASN1_SEQUENCE)); |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 817 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 818 | memmove(sig, p, len); |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 819 | *sig_len = len; |
| 820 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 821 | return 0; |
Neil Armstrong | 1502165 | 2022-03-01 10:14:17 +0100 | [diff] [blame] | 822 | } |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 823 | |
Valerio Setti | 4ac2c18 | 2023-12-05 07:59:01 +0100 | [diff] [blame] | 824 | /* Common helper for ECDSA sign using PSA functions. |
| 825 | * Instead of extracting key's properties in order to check which kind of ECDSA |
| 826 | * signature it supports, we try both deterministic and non-deterministic. |
| 827 | */ |
Valerio Setti | 884c1ec | 2023-06-23 12:09:13 +0200 | [diff] [blame] | 828 | static int ecdsa_sign_psa(mbedtls_svc_key_id_t key_id, mbedtls_md_type_t md_alg, |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 829 | const unsigned char *hash, size_t hash_len, |
| 830 | unsigned char *sig, size_t sig_size, size_t *sig_len) |
| 831 | { |
| 832 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
| 833 | psa_status_t status; |
Valerio Setti | 884c1ec | 2023-06-23 12:09:13 +0200 | [diff] [blame] | 834 | |
Valerio Setti | 4ac2c18 | 2023-12-05 07:59:01 +0100 | [diff] [blame] | 835 | status = psa_sign_hash(key_id, |
| 836 | PSA_ALG_DETERMINISTIC_ECDSA(mbedtls_md_psa_alg_from_type(md_alg)), |
| 837 | hash, hash_len, sig, sig_size, sig_len); |
| 838 | if (status == PSA_SUCCESS) { |
| 839 | goto done; |
| 840 | } else if (status != PSA_ERROR_NOT_PERMITTED) { |
Valerio Setti | 884c1ec | 2023-06-23 12:09:13 +0200 | [diff] [blame] | 841 | return PSA_PK_ECDSA_TO_MBEDTLS_ERR(status); |
| 842 | } |
Valerio Setti | 884c1ec | 2023-06-23 12:09:13 +0200 | [diff] [blame] | 843 | |
Valerio Setti | 4ac2c18 | 2023-12-05 07:59:01 +0100 | [diff] [blame] | 844 | status = psa_sign_hash(key_id, |
| 845 | PSA_ALG_ECDSA(mbedtls_md_psa_alg_from_type(md_alg)), |
| 846 | hash, hash_len, sig, sig_size, sig_len); |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 847 | if (status != PSA_SUCCESS) { |
| 848 | return PSA_PK_ECDSA_TO_MBEDTLS_ERR(status); |
| 849 | } |
| 850 | |
Valerio Setti | 4ac2c18 | 2023-12-05 07:59:01 +0100 | [diff] [blame] | 851 | done: |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 852 | ret = pk_ecdsa_sig_asn1_from_psa(sig, sig_len, sig_size); |
| 853 | |
| 854 | return ret; |
| 855 | } |
| 856 | |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 857 | static int ecdsa_opaque_sign_wrap(mbedtls_pk_context *pk, |
| 858 | mbedtls_md_type_t md_alg, |
| 859 | const unsigned char *hash, size_t hash_len, |
| 860 | unsigned char *sig, size_t sig_size, |
| 861 | size_t *sig_len, |
| 862 | int (*f_rng)(void *, unsigned char *, size_t), |
| 863 | void *p_rng) |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 864 | { |
| 865 | ((void) f_rng); |
| 866 | ((void) p_rng); |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 867 | |
Valerio Setti | 884c1ec | 2023-06-23 12:09:13 +0200 | [diff] [blame] | 868 | return ecdsa_sign_psa(pk->priv_id, md_alg, hash, hash_len, sig, sig_size, |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 869 | sig_len); |
| 870 | } |
| 871 | |
| 872 | #if defined(MBEDTLS_PK_USE_PSA_EC_DATA) |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 873 | /* When PK_USE_PSA_EC_DATA is defined opaque and non-opaque keys end up |
| 874 | * using the same function. */ |
| 875 | #define ecdsa_sign_wrap ecdsa_opaque_sign_wrap |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 876 | #else /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 877 | static int ecdsa_sign_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 878 | const unsigned char *hash, size_t hash_len, |
| 879 | unsigned char *sig, size_t sig_size, size_t *sig_len, |
| 880 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 881 | { |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 882 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 883 | mbedtls_svc_key_id_t key_id = MBEDTLS_SVC_KEY_ID_INIT; |
| 884 | psa_status_t status; |
Valerio Setti | ae8c628 | 2023-05-18 18:57:57 +0200 | [diff] [blame] | 885 | mbedtls_ecp_keypair *ctx = pk->pk_ctx; |
| 886 | psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; |
| 887 | unsigned char buf[MBEDTLS_PSA_MAX_EC_KEY_PAIR_LENGTH]; |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 888 | size_t curve_bits; |
| 889 | psa_ecc_family_t curve = |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 890 | mbedtls_ecc_group_to_psa(ctx->grp.id, &curve_bits); |
Gilles Peskine | 13caa94 | 2022-10-04 22:59:26 +0200 | [diff] [blame] | 891 | size_t key_len = PSA_BITS_TO_BYTES(curve_bits); |
Manuel Pégourié-Gonnard | 116175c | 2023-07-25 12:06:55 +0200 | [diff] [blame] | 892 | psa_algorithm_t psa_hash = mbedtls_md_psa_alg_from_type(md_alg); |
| 893 | psa_algorithm_t psa_sig_md = MBEDTLS_PK_PSA_ALG_ECDSA_MAYBE_DET(psa_hash); |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 894 | ((void) f_rng); |
| 895 | ((void) p_rng); |
| 896 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 897 | if (curve == 0) { |
| 898 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 899 | } |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 900 | |
Gilles Peskine | 13caa94 | 2022-10-04 22:59:26 +0200 | [diff] [blame] | 901 | if (key_len > sizeof(buf)) { |
Valerio Setti | b761b15 | 2023-01-31 14:56:04 +0100 | [diff] [blame] | 902 | return MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 903 | } |
Gilles Peskine | 13caa94 | 2022-10-04 22:59:26 +0200 | [diff] [blame] | 904 | ret = mbedtls_mpi_write_binary(&ctx->d, buf, key_len); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 905 | if (ret != 0) { |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 906 | goto cleanup; |
| 907 | } |
| 908 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 909 | psa_set_key_type(&attributes, PSA_KEY_TYPE_ECC_KEY_PAIR(curve)); |
| 910 | psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_SIGN_HASH); |
| 911 | psa_set_key_algorithm(&attributes, psa_sig_md); |
| 912 | |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 913 | status = psa_import_key(&attributes, buf, key_len, &key_id); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 914 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 915 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 916 | goto cleanup; |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 917 | } |
| 918 | |
Valerio Setti | 884c1ec | 2023-06-23 12:09:13 +0200 | [diff] [blame] | 919 | ret = ecdsa_sign_psa(key_id, md_alg, hash, hash_len, sig, sig_size, sig_len); |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 920 | |
| 921 | cleanup: |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 922 | mbedtls_platform_zeroize(buf, sizeof(buf)); |
| 923 | status = psa_destroy_key(key_id); |
| 924 | if (ret == 0 && status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 925 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 926 | } |
Neil Armstrong | ff70f0b | 2022-03-03 14:31:17 +0100 | [diff] [blame] | 927 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 928 | return ret; |
Neil Armstrong | e960690 | 2022-02-09 14:23:00 +0100 | [diff] [blame] | 929 | } |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 930 | #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 931 | #else /* MBEDTLS_USE_PSA_CRYPTO */ |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 932 | static int ecdsa_sign_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 933 | const unsigned char *hash, size_t hash_len, |
| 934 | unsigned char *sig, size_t sig_size, size_t *sig_len, |
| 935 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Manuel Pégourié-Gonnard | 8df2769 | 2013-08-21 10:34:38 +0200 | [diff] [blame] | 936 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 937 | return mbedtls_ecdsa_write_signature((mbedtls_ecdsa_context *) pk->pk_ctx, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 938 | md_alg, hash, hash_len, |
| 939 | sig, sig_size, sig_len, |
| 940 | f_rng, p_rng); |
Manuel Pégourié-Gonnard | 8df2769 | 2013-08-21 10:34:38 +0200 | [diff] [blame] | 941 | } |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 942 | #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
| 943 | #endif /* MBEDTLS_PK_CAN_ECDSA_SIGN */ |
Manuel Pégourié-Gonnard | 8df2769 | 2013-08-21 10:34:38 +0200 | [diff] [blame] | 944 | |
Valerio Setti | 80d0798 | 2023-02-08 13:49:17 +0100 | [diff] [blame] | 945 | #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 946 | /* Forward declarations */ |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 947 | static int ecdsa_verify_rs_wrap(mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg, |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 948 | const unsigned char *hash, size_t hash_len, |
| 949 | const unsigned char *sig, size_t sig_len, |
| 950 | void *rs_ctx); |
| 951 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 952 | static int ecdsa_sign_rs_wrap(mbedtls_pk_context *ctx, mbedtls_md_type_t md_alg, |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 953 | const unsigned char *hash, size_t hash_len, |
| 954 | unsigned char *sig, size_t sig_size, size_t *sig_len, |
| 955 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng, |
| 956 | void *rs_ctx); |
| 957 | |
| 958 | /* |
| 959 | * Restart context for ECDSA operations with ECKEY context |
| 960 | * |
| 961 | * We need to store an actual ECDSA context, as we need to pass the same to |
| 962 | * the underlying ecdsa function, so we can't create it on the fly every time. |
| 963 | */ |
| 964 | typedef struct { |
| 965 | mbedtls_ecdsa_restart_ctx ecdsa_rs; |
| 966 | mbedtls_ecdsa_context ecdsa_ctx; |
| 967 | } eckey_restart_ctx; |
| 968 | |
| 969 | static void *eckey_rs_alloc(void) |
| 970 | { |
| 971 | eckey_restart_ctx *rs_ctx; |
| 972 | |
| 973 | void *ctx = mbedtls_calloc(1, sizeof(eckey_restart_ctx)); |
| 974 | |
| 975 | if (ctx != NULL) { |
| 976 | rs_ctx = ctx; |
| 977 | mbedtls_ecdsa_restart_init(&rs_ctx->ecdsa_rs); |
| 978 | mbedtls_ecdsa_init(&rs_ctx->ecdsa_ctx); |
| 979 | } |
| 980 | |
| 981 | return ctx; |
| 982 | } |
| 983 | |
| 984 | static void eckey_rs_free(void *ctx) |
| 985 | { |
| 986 | eckey_restart_ctx *rs_ctx; |
| 987 | |
| 988 | if (ctx == NULL) { |
| 989 | return; |
| 990 | } |
| 991 | |
| 992 | rs_ctx = ctx; |
| 993 | mbedtls_ecdsa_restart_free(&rs_ctx->ecdsa_rs); |
| 994 | mbedtls_ecdsa_free(&rs_ctx->ecdsa_ctx); |
| 995 | |
| 996 | mbedtls_free(ctx); |
| 997 | } |
| 998 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 999 | static int eckey_verify_rs_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1000 | const unsigned char *hash, size_t hash_len, |
| 1001 | const unsigned char *sig, size_t sig_len, |
| 1002 | void *rs_ctx) |
| 1003 | { |
| 1004 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
| 1005 | eckey_restart_ctx *rs = rs_ctx; |
| 1006 | |
| 1007 | /* Should never happen */ |
| 1008 | if (rs == NULL) { |
| 1009 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 1010 | } |
| 1011 | |
| 1012 | /* set up our own sub-context if needed (that is, on first run) */ |
| 1013 | if (rs->ecdsa_ctx.grp.pbits == 0) { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1014 | MBEDTLS_MPI_CHK(mbedtls_ecdsa_from_keypair(&rs->ecdsa_ctx, pk->pk_ctx)); |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1015 | } |
| 1016 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1017 | MBEDTLS_MPI_CHK(ecdsa_verify_rs_wrap(pk, |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1018 | md_alg, hash, hash_len, |
| 1019 | sig, sig_len, &rs->ecdsa_rs)); |
| 1020 | |
| 1021 | cleanup: |
| 1022 | return ret; |
| 1023 | } |
| 1024 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1025 | static int eckey_sign_rs_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1026 | const unsigned char *hash, size_t hash_len, |
| 1027 | unsigned char *sig, size_t sig_size, size_t *sig_len, |
| 1028 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng, |
| 1029 | void *rs_ctx) |
| 1030 | { |
| 1031 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
| 1032 | eckey_restart_ctx *rs = rs_ctx; |
| 1033 | |
| 1034 | /* Should never happen */ |
| 1035 | if (rs == NULL) { |
| 1036 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 1037 | } |
| 1038 | |
| 1039 | /* set up our own sub-context if needed (that is, on first run) */ |
| 1040 | if (rs->ecdsa_ctx.grp.pbits == 0) { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1041 | MBEDTLS_MPI_CHK(mbedtls_ecdsa_from_keypair(&rs->ecdsa_ctx, pk->pk_ctx)); |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1042 | } |
| 1043 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1044 | MBEDTLS_MPI_CHK(ecdsa_sign_rs_wrap(pk, md_alg, |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1045 | hash, hash_len, sig, sig_size, sig_len, |
| 1046 | f_rng, p_rng, &rs->ecdsa_rs)); |
| 1047 | |
| 1048 | cleanup: |
| 1049 | return ret; |
| 1050 | } |
Valerio Setti | 80d0798 | 2023-02-08 13:49:17 +0100 | [diff] [blame] | 1051 | #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1052 | |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1053 | #if defined(MBEDTLS_USE_PSA_CRYPTO) |
Valerio Setti | bb7603a | 2023-06-21 18:34:54 +0200 | [diff] [blame] | 1054 | #if defined(MBEDTLS_PK_USE_PSA_EC_DATA) |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1055 | static int eckey_check_pair_psa(mbedtls_pk_context *pub, mbedtls_pk_context *prv) |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1056 | { |
Valerio Setti | 9efa8c4 | 2023-05-19 13:27:30 +0200 | [diff] [blame] | 1057 | psa_status_t status; |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1058 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
Valerio Setti | 8eb5526 | 2023-04-04 10:20:53 +0200 | [diff] [blame] | 1059 | uint8_t prv_key_buf[MBEDTLS_PSA_MAX_EC_PUBKEY_LENGTH]; |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1060 | size_t prv_key_len; |
Valerio Setti | ae8c628 | 2023-05-18 18:57:57 +0200 | [diff] [blame] | 1061 | mbedtls_svc_key_id_t key_id = prv->priv_id; |
Valerio Setti | 9efa8c4 | 2023-05-19 13:27:30 +0200 | [diff] [blame] | 1062 | |
| 1063 | status = psa_export_public_key(key_id, prv_key_buf, sizeof(prv_key_buf), |
| 1064 | &prv_key_len); |
| 1065 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
| 1066 | if (ret != 0) { |
| 1067 | return ret; |
| 1068 | } |
| 1069 | |
| 1070 | if (memcmp(prv_key_buf, pub->pub_raw, pub->pub_raw_len) != 0) { |
| 1071 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 1072 | } |
Valerio Setti | bb7603a | 2023-06-21 18:34:54 +0200 | [diff] [blame] | 1073 | |
| 1074 | return 0; |
| 1075 | } |
| 1076 | #else /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
| 1077 | static int eckey_check_pair_psa(mbedtls_pk_context *pub, mbedtls_pk_context *prv) |
| 1078 | { |
| 1079 | psa_status_t status; |
| 1080 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
| 1081 | uint8_t prv_key_buf[MBEDTLS_PSA_MAX_EC_PUBKEY_LENGTH]; |
| 1082 | size_t prv_key_len; |
Valerio Setti | 9efa8c4 | 2023-05-19 13:27:30 +0200 | [diff] [blame] | 1083 | psa_status_t destruction_status; |
Valerio Setti | ae8c628 | 2023-05-18 18:57:57 +0200 | [diff] [blame] | 1084 | mbedtls_svc_key_id_t key_id = MBEDTLS_SVC_KEY_ID_INIT; |
| 1085 | psa_key_attributes_t key_attr = PSA_KEY_ATTRIBUTES_INIT; |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1086 | uint8_t pub_key_buf[MBEDTLS_PSA_MAX_EC_PUBKEY_LENGTH]; |
| 1087 | size_t pub_key_len; |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1088 | size_t curve_bits; |
Valerio Setti | f286664 | 2023-04-06 16:49:54 +0200 | [diff] [blame] | 1089 | const psa_ecc_family_t curve = |
Valerio Setti | a1b8af6 | 2023-05-17 15:34:57 +0200 | [diff] [blame] | 1090 | mbedtls_ecc_group_to_psa(mbedtls_pk_ec_ro(*prv)->grp.id, &curve_bits); |
Valerio Setti | c1541cb | 2023-05-17 15:49:55 +0200 | [diff] [blame] | 1091 | const size_t curve_bytes = PSA_BITS_TO_BYTES(curve_bits); |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1092 | |
Valerio Setti | a7cb845 | 2023-05-22 18:39:43 +0200 | [diff] [blame] | 1093 | if (curve == 0) { |
| 1094 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 1095 | } |
| 1096 | |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1097 | psa_set_key_type(&key_attr, PSA_KEY_TYPE_ECC_KEY_PAIR(curve)); |
| 1098 | psa_set_key_usage_flags(&key_attr, PSA_KEY_USAGE_EXPORT); |
| 1099 | |
Valerio Setti | a1b8af6 | 2023-05-17 15:34:57 +0200 | [diff] [blame] | 1100 | ret = mbedtls_mpi_write_binary(&mbedtls_pk_ec_ro(*prv)->d, |
| 1101 | prv_key_buf, curve_bytes); |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1102 | if (ret != 0) { |
Valerio Setti | 35d1dac | 2023-06-30 18:04:16 +0200 | [diff] [blame] | 1103 | mbedtls_platform_zeroize(prv_key_buf, sizeof(prv_key_buf)); |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1104 | return ret; |
| 1105 | } |
| 1106 | |
| 1107 | status = psa_import_key(&key_attr, prv_key_buf, curve_bytes, &key_id); |
Valerio Setti | 35d1dac | 2023-06-30 18:04:16 +0200 | [diff] [blame] | 1108 | mbedtls_platform_zeroize(prv_key_buf, sizeof(prv_key_buf)); |
Valerio Setti | 1df94f8 | 2023-04-07 08:59:24 +0200 | [diff] [blame] | 1109 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
| 1110 | if (ret != 0) { |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1111 | return ret; |
| 1112 | } |
| 1113 | |
Valerio Setti | 35d1dac | 2023-06-30 18:04:16 +0200 | [diff] [blame] | 1114 | // From now on prv_key_buf is used to store the public key of prv. |
Valerio Setti | 1df94f8 | 2023-04-07 08:59:24 +0200 | [diff] [blame] | 1115 | status = psa_export_public_key(key_id, prv_key_buf, sizeof(prv_key_buf), |
| 1116 | &prv_key_len); |
| 1117 | ret = PSA_PK_TO_MBEDTLS_ERR(status); |
| 1118 | destruction_status = psa_destroy_key(key_id); |
| 1119 | if (ret != 0) { |
| 1120 | return ret; |
| 1121 | } else if (destruction_status != PSA_SUCCESS) { |
| 1122 | return PSA_PK_TO_MBEDTLS_ERR(destruction_status); |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1123 | } |
| 1124 | |
Valerio Setti | a1b8af6 | 2023-05-17 15:34:57 +0200 | [diff] [blame] | 1125 | ret = mbedtls_ecp_point_write_binary(&mbedtls_pk_ec_rw(*pub)->grp, |
| 1126 | &mbedtls_pk_ec_rw(*pub)->Q, |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1127 | MBEDTLS_ECP_PF_UNCOMPRESSED, |
| 1128 | &pub_key_len, pub_key_buf, |
| 1129 | sizeof(pub_key_buf)); |
| 1130 | if (ret != 0) { |
| 1131 | return ret; |
| 1132 | } |
| 1133 | |
| 1134 | if (memcmp(prv_key_buf, pub_key_buf, curve_bytes) != 0) { |
| 1135 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 1136 | } |
| 1137 | |
| 1138 | return 0; |
| 1139 | } |
Valerio Setti | bb7603a | 2023-06-21 18:34:54 +0200 | [diff] [blame] | 1140 | #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1141 | |
Valerio Setti | bb7603a | 2023-06-21 18:34:54 +0200 | [diff] [blame] | 1142 | static int eckey_check_pair_wrap(mbedtls_pk_context *pub, mbedtls_pk_context *prv, |
| 1143 | int (*f_rng)(void *, unsigned char *, size_t), |
| 1144 | void *p_rng) |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1145 | { |
Valerio Setti | 0fe1ee2 | 2023-04-03 14:42:22 +0200 | [diff] [blame] | 1146 | (void) f_rng; |
| 1147 | (void) p_rng; |
Valerio Setti | 9d65f0e | 2023-04-07 08:53:17 +0200 | [diff] [blame] | 1148 | return eckey_check_pair_psa(pub, prv); |
Valerio Setti | bb7603a | 2023-06-21 18:34:54 +0200 | [diff] [blame] | 1149 | } |
| 1150 | #else /* MBEDTLS_USE_PSA_CRYPTO */ |
| 1151 | static int eckey_check_pair_wrap(mbedtls_pk_context *pub, mbedtls_pk_context *prv, |
| 1152 | int (*f_rng)(void *, unsigned char *, size_t), |
| 1153 | void *p_rng) |
| 1154 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1155 | return mbedtls_ecp_check_pub_priv((const mbedtls_ecp_keypair *) pub->pk_ctx, |
| 1156 | (const mbedtls_ecp_keypair *) prv->pk_ctx, |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1157 | f_rng, p_rng); |
| 1158 | } |
Valerio Setti | bb7603a | 2023-06-21 18:34:54 +0200 | [diff] [blame] | 1159 | #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1160 | |
Valerio Setti | 88a3aee | 2023-06-29 15:01:10 +0200 | [diff] [blame] | 1161 | #if defined(MBEDTLS_USE_PSA_CRYPTO) |
| 1162 | #if defined(MBEDTLS_PK_USE_PSA_EC_DATA) |
| 1163 | /* When PK_USE_PSA_EC_DATA is defined opaque and non-opaque keys end up |
| 1164 | * using the same function. */ |
| 1165 | #define ecdsa_opaque_check_pair_wrap eckey_check_pair_wrap |
| 1166 | #else /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
| 1167 | static int ecdsa_opaque_check_pair_wrap(mbedtls_pk_context *pub, |
| 1168 | mbedtls_pk_context *prv, |
| 1169 | int (*f_rng)(void *, unsigned char *, size_t), |
| 1170 | void *p_rng) |
| 1171 | { |
| 1172 | psa_status_t status; |
| 1173 | uint8_t exp_pub_key[MBEDTLS_PK_MAX_EC_PUBKEY_RAW_LEN]; |
| 1174 | size_t exp_pub_key_len = 0; |
| 1175 | uint8_t pub_key[MBEDTLS_PK_MAX_EC_PUBKEY_RAW_LEN]; |
| 1176 | size_t pub_key_len = 0; |
| 1177 | int ret; |
| 1178 | (void) f_rng; |
| 1179 | (void) p_rng; |
| 1180 | |
| 1181 | status = psa_export_public_key(prv->priv_id, exp_pub_key, sizeof(exp_pub_key), |
| 1182 | &exp_pub_key_len); |
| 1183 | if (status != PSA_SUCCESS) { |
| 1184 | ret = psa_pk_status_to_mbedtls(status); |
| 1185 | return ret; |
| 1186 | } |
| 1187 | ret = mbedtls_ecp_point_write_binary(&(mbedtls_pk_ec_ro(*pub)->grp), |
| 1188 | &(mbedtls_pk_ec_ro(*pub)->Q), |
| 1189 | MBEDTLS_ECP_PF_UNCOMPRESSED, |
| 1190 | &pub_key_len, pub_key, sizeof(pub_key)); |
| 1191 | if (ret != 0) { |
| 1192 | return ret; |
| 1193 | } |
| 1194 | if ((exp_pub_key_len != pub_key_len) || |
| 1195 | memcmp(exp_pub_key, pub_key, exp_pub_key_len)) { |
| 1196 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 1197 | } |
| 1198 | return 0; |
| 1199 | } |
| 1200 | #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
| 1201 | #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
| 1202 | |
Valerio Setti | b536126 | 2023-05-18 18:51:58 +0200 | [diff] [blame] | 1203 | #if !defined(MBEDTLS_PK_USE_PSA_EC_DATA) |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1204 | static void *eckey_alloc_wrap(void) |
| 1205 | { |
| 1206 | void *ctx = mbedtls_calloc(1, sizeof(mbedtls_ecp_keypair)); |
| 1207 | |
| 1208 | if (ctx != NULL) { |
| 1209 | mbedtls_ecp_keypair_init(ctx); |
| 1210 | } |
| 1211 | |
| 1212 | return ctx; |
| 1213 | } |
| 1214 | |
| 1215 | static void eckey_free_wrap(void *ctx) |
| 1216 | { |
| 1217 | mbedtls_ecp_keypair_free((mbedtls_ecp_keypair *) ctx); |
| 1218 | mbedtls_free(ctx); |
| 1219 | } |
Valerio Setti | b536126 | 2023-05-18 18:51:58 +0200 | [diff] [blame] | 1220 | #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1221 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1222 | static void eckey_debug(mbedtls_pk_context *pk, mbedtls_pk_debug_item *items) |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1223 | { |
Valerio Setti | a1b8af6 | 2023-05-17 15:34:57 +0200 | [diff] [blame] | 1224 | #if defined(MBEDTLS_PK_USE_PSA_EC_DATA) |
| 1225 | items->type = MBEDTLS_PK_DEBUG_PSA_EC; |
| 1226 | items->name = "eckey.Q"; |
| 1227 | items->value = pk; |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 1228 | #else /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1229 | mbedtls_ecp_keypair *ecp = (mbedtls_ecp_keypair *) pk->pk_ctx; |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1230 | items->type = MBEDTLS_PK_DEBUG_ECP; |
| 1231 | items->name = "eckey.Q"; |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1232 | items->value = &(ecp->Q); |
Valerio Setti | 5c26b30 | 2023-06-21 19:47:01 +0200 | [diff] [blame] | 1233 | #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1234 | } |
| 1235 | |
| 1236 | const mbedtls_pk_info_t mbedtls_eckey_info = { |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1237 | .type = MBEDTLS_PK_ECKEY, |
| 1238 | .name = "EC", |
| 1239 | .get_bitlen = eckey_get_bitlen, |
| 1240 | .can_do = eckey_can_do, |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1241 | #if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY) |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1242 | .verify_func = ecdsa_verify_wrap, /* Compatible key structures */ |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1243 | #else /* MBEDTLS_PK_CAN_ECDSA_VERIFY */ |
| 1244 | .verify_func = NULL, |
| 1245 | #endif /* MBEDTLS_PK_CAN_ECDSA_VERIFY */ |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1246 | #if defined(MBEDTLS_PK_CAN_ECDSA_SIGN) |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1247 | .sign_func = ecdsa_sign_wrap, /* Compatible key structures */ |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1248 | #else /* MBEDTLS_PK_CAN_ECDSA_VERIFY */ |
| 1249 | .sign_func = NULL, |
| 1250 | #endif /* MBEDTLS_PK_CAN_ECDSA_VERIFY */ |
Valerio Setti | 5b16e9e | 2023-02-07 08:08:53 +0100 | [diff] [blame] | 1251 | #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1252 | .verify_rs_func = eckey_verify_rs_wrap, |
| 1253 | .sign_rs_func = eckey_sign_rs_wrap, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1254 | .rs_alloc_func = eckey_rs_alloc, |
| 1255 | .rs_free_func = eckey_rs_free, |
| 1256 | #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ |
| 1257 | .decrypt_func = NULL, |
| 1258 | .encrypt_func = NULL, |
Valerio Setti | bb7603a | 2023-06-21 18:34:54 +0200 | [diff] [blame] | 1259 | .check_pair_func = eckey_check_pair_wrap, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1260 | #if defined(MBEDTLS_PK_USE_PSA_EC_DATA) |
| 1261 | .ctx_alloc_func = NULL, |
| 1262 | .ctx_free_func = NULL, |
| 1263 | #else /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1264 | .ctx_alloc_func = eckey_alloc_wrap, |
| 1265 | .ctx_free_func = eckey_free_wrap, |
Valerio Setti | b536126 | 2023-05-18 18:51:58 +0200 | [diff] [blame] | 1266 | #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1267 | .debug_func = eckey_debug, |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1268 | }; |
| 1269 | |
| 1270 | /* |
| 1271 | * EC key restricted to ECDH |
| 1272 | */ |
| 1273 | static int eckeydh_can_do(mbedtls_pk_type_t type) |
| 1274 | { |
| 1275 | return type == MBEDTLS_PK_ECKEY || |
| 1276 | type == MBEDTLS_PK_ECKEY_DH; |
| 1277 | } |
| 1278 | |
| 1279 | const mbedtls_pk_info_t mbedtls_eckeydh_info = { |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1280 | .type = MBEDTLS_PK_ECKEY_DH, |
| 1281 | .name = "EC_DH", |
| 1282 | .get_bitlen = eckey_get_bitlen, /* Same underlying key structure */ |
| 1283 | .can_do = eckeydh_can_do, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1284 | .verify_func = NULL, |
| 1285 | .sign_func = NULL, |
| 1286 | #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) |
| 1287 | .verify_rs_func = NULL, |
| 1288 | .sign_rs_func = NULL, |
| 1289 | #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ |
| 1290 | .decrypt_func = NULL, |
| 1291 | .encrypt_func = NULL, |
Valerio Setti | bb7603a | 2023-06-21 18:34:54 +0200 | [diff] [blame] | 1292 | .check_pair_func = eckey_check_pair_wrap, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1293 | #if defined(MBEDTLS_PK_USE_PSA_EC_DATA) |
| 1294 | .ctx_alloc_func = NULL, |
| 1295 | .ctx_free_func = NULL, |
| 1296 | #else /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1297 | .ctx_alloc_func = eckey_alloc_wrap, /* Same underlying key structure */ |
| 1298 | .ctx_free_func = eckey_free_wrap, /* Same underlying key structure */ |
Valerio Setti | b536126 | 2023-05-18 18:51:58 +0200 | [diff] [blame] | 1299 | #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1300 | .debug_func = eckey_debug, /* Same underlying key structure */ |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1301 | }; |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1302 | |
| 1303 | #if defined(MBEDTLS_PK_CAN_ECDSA_SOME) |
| 1304 | static int ecdsa_can_do(mbedtls_pk_type_t type) |
| 1305 | { |
| 1306 | return type == MBEDTLS_PK_ECDSA; |
| 1307 | } |
| 1308 | |
Valerio Setti | 5b16e9e | 2023-02-07 08:08:53 +0100 | [diff] [blame] | 1309 | #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1310 | static int ecdsa_verify_rs_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1311 | const unsigned char *hash, size_t hash_len, |
| 1312 | const unsigned char *sig, size_t sig_len, |
| 1313 | void *rs_ctx) |
Manuel Pégourié-Gonnard | 1f59606 | 2017-05-09 10:42:40 +0200 | [diff] [blame] | 1314 | { |
Janos Follath | 24eed8d | 2019-11-22 13:21:35 +0000 | [diff] [blame] | 1315 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
Manuel Pégourié-Gonnard | 1f59606 | 2017-05-09 10:42:40 +0200 | [diff] [blame] | 1316 | ((void) md_alg); |
| 1317 | |
| 1318 | ret = mbedtls_ecdsa_read_signature_restartable( |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1319 | (mbedtls_ecdsa_context *) pk->pk_ctx, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1320 | hash, hash_len, sig, sig_len, |
| 1321 | (mbedtls_ecdsa_restart_ctx *) rs_ctx); |
Manuel Pégourié-Gonnard | 1f59606 | 2017-05-09 10:42:40 +0200 | [diff] [blame] | 1322 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1323 | if (ret == MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH) { |
| 1324 | return MBEDTLS_ERR_PK_SIG_LEN_MISMATCH; |
| 1325 | } |
Manuel Pégourié-Gonnard | 1f59606 | 2017-05-09 10:42:40 +0200 | [diff] [blame] | 1326 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1327 | return ret; |
Manuel Pégourié-Gonnard | 1f59606 | 2017-05-09 10:42:40 +0200 | [diff] [blame] | 1328 | } |
| 1329 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1330 | static int ecdsa_sign_rs_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1331 | const unsigned char *hash, size_t hash_len, |
| 1332 | unsigned char *sig, size_t sig_size, size_t *sig_len, |
| 1333 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng, |
| 1334 | void *rs_ctx) |
Manuel Pégourié-Gonnard | 1f59606 | 2017-05-09 10:42:40 +0200 | [diff] [blame] | 1335 | { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1336 | return mbedtls_ecdsa_write_signature_restartable( |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1337 | (mbedtls_ecdsa_context *) pk->pk_ctx, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1338 | md_alg, hash, hash_len, sig, sig_size, sig_len, f_rng, p_rng, |
| 1339 | (mbedtls_ecdsa_restart_ctx *) rs_ctx); |
Manuel Pégourié-Gonnard | 1f59606 | 2017-05-09 10:42:40 +0200 | [diff] [blame] | 1340 | |
| 1341 | } |
Manuel Pégourié-Gonnard | 1f59606 | 2017-05-09 10:42:40 +0200 | [diff] [blame] | 1342 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1343 | static void *ecdsa_rs_alloc(void) |
Manuel Pégourié-Gonnard | fe68770 | 2017-08-18 17:04:07 +0200 | [diff] [blame] | 1344 | { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1345 | void *ctx = mbedtls_calloc(1, sizeof(mbedtls_ecdsa_restart_ctx)); |
Manuel Pégourié-Gonnard | fe68770 | 2017-08-18 17:04:07 +0200 | [diff] [blame] | 1346 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1347 | if (ctx != NULL) { |
| 1348 | mbedtls_ecdsa_restart_init(ctx); |
| 1349 | } |
Manuel Pégourié-Gonnard | fe68770 | 2017-08-18 17:04:07 +0200 | [diff] [blame] | 1350 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1351 | return ctx; |
Manuel Pégourié-Gonnard | fe68770 | 2017-08-18 17:04:07 +0200 | [diff] [blame] | 1352 | } |
| 1353 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1354 | static void ecdsa_rs_free(void *ctx) |
Manuel Pégourié-Gonnard | fe68770 | 2017-08-18 17:04:07 +0200 | [diff] [blame] | 1355 | { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1356 | mbedtls_ecdsa_restart_free(ctx); |
| 1357 | mbedtls_free(ctx); |
Manuel Pégourié-Gonnard | fe68770 | 2017-08-18 17:04:07 +0200 | [diff] [blame] | 1358 | } |
Valerio Setti | 5b16e9e | 2023-02-07 08:08:53 +0100 | [diff] [blame] | 1359 | #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ |
Manuel Pégourié-Gonnard | fe68770 | 2017-08-18 17:04:07 +0200 | [diff] [blame] | 1360 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 1361 | const mbedtls_pk_info_t mbedtls_ecdsa_info = { |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1362 | .type = MBEDTLS_PK_ECDSA, |
| 1363 | .name = "ECDSA", |
| 1364 | .get_bitlen = eckey_get_bitlen, /* Compatible key structures */ |
| 1365 | .can_do = ecdsa_can_do, |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1366 | #if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY) |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1367 | .verify_func = ecdsa_verify_wrap, /* Compatible key structures */ |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1368 | #else /* MBEDTLS_PK_CAN_ECDSA_VERIFY */ |
| 1369 | .verify_func = NULL, |
| 1370 | #endif /* MBEDTLS_PK_CAN_ECDSA_VERIFY */ |
Valerio Setti | 1cdddac | 2023-02-02 13:55:57 +0100 | [diff] [blame] | 1371 | #if defined(MBEDTLS_PK_CAN_ECDSA_SIGN) |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1372 | .sign_func = ecdsa_sign_wrap, /* Compatible key structures */ |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1373 | #else /* MBEDTLS_PK_CAN_ECDSA_SIGN */ |
| 1374 | .sign_func = NULL, |
| 1375 | #endif /* MBEDTLS_PK_CAN_ECDSA_SIGN */ |
Valerio Setti | 5b16e9e | 2023-02-07 08:08:53 +0100 | [diff] [blame] | 1376 | #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1377 | .verify_rs_func = ecdsa_verify_rs_wrap, |
| 1378 | .sign_rs_func = ecdsa_sign_rs_wrap, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1379 | .rs_alloc_func = ecdsa_rs_alloc, |
| 1380 | .rs_free_func = ecdsa_rs_free, |
| 1381 | #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ |
| 1382 | .decrypt_func = NULL, |
| 1383 | .encrypt_func = NULL, |
Valerio Setti | bb7603a | 2023-06-21 18:34:54 +0200 | [diff] [blame] | 1384 | .check_pair_func = eckey_check_pair_wrap, /* Compatible key structures */ |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1385 | #if defined(MBEDTLS_PK_USE_PSA_EC_DATA) |
| 1386 | .ctx_alloc_func = NULL, |
| 1387 | .ctx_free_func = NULL, |
| 1388 | #else /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1389 | .ctx_alloc_func = eckey_alloc_wrap, /* Compatible key structures */ |
| 1390 | .ctx_free_func = eckey_free_wrap, /* Compatible key structures */ |
Valerio Setti | b536126 | 2023-05-18 18:51:58 +0200 | [diff] [blame] | 1391 | #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1392 | .debug_func = eckey_debug, /* Compatible key structures */ |
Manuel Pégourié-Gonnard | 09162dd | 2013-08-14 18:16:50 +0200 | [diff] [blame] | 1393 | }; |
Valerio Setti | 7ca1318 | 2023-01-27 13:22:42 +0100 | [diff] [blame] | 1394 | #endif /* MBEDTLS_PK_CAN_ECDSA_SOME */ |
Valerio Setti | d9d74c2 | 2023-06-29 15:00:02 +0200 | [diff] [blame] | 1395 | #endif /* MBEDTLS_PK_HAVE_ECC_KEYS */ |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1396 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 1397 | #if defined(MBEDTLS_PK_RSA_ALT_SUPPORT) |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1398 | /* |
| 1399 | * Support for alternative RSA-private implementations |
| 1400 | */ |
| 1401 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1402 | static int rsa_alt_can_do(mbedtls_pk_type_t type) |
Manuel Pégourié-Gonnard | 20422e9 | 2014-06-05 13:41:44 +0200 | [diff] [blame] | 1403 | { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1404 | return type == MBEDTLS_PK_RSA; |
Manuel Pégourié-Gonnard | 20422e9 | 2014-06-05 13:41:44 +0200 | [diff] [blame] | 1405 | } |
| 1406 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1407 | static size_t rsa_alt_get_bitlen(mbedtls_pk_context *pk) |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1408 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1409 | const mbedtls_rsa_alt_context *rsa_alt = pk->pk_ctx; |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1410 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1411 | return 8 * rsa_alt->key_len_func(rsa_alt->key); |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1412 | } |
| 1413 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1414 | static int rsa_alt_sign_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1415 | const unsigned char *hash, size_t hash_len, |
| 1416 | unsigned char *sig, size_t sig_size, size_t *sig_len, |
| 1417 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1418 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1419 | mbedtls_rsa_alt_context *rsa_alt = pk->pk_ctx; |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1420 | |
Dave Rodgman | 02a53d7 | 2023-09-28 17:17:07 +0100 | [diff] [blame] | 1421 | #if SIZE_MAX > UINT_MAX |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1422 | if (UINT_MAX < hash_len) { |
| 1423 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 1424 | } |
Dave Rodgman | 02a53d7 | 2023-09-28 17:17:07 +0100 | [diff] [blame] | 1425 | #endif |
Andres AG | 7284987 | 2017-01-19 11:24:33 +0000 | [diff] [blame] | 1426 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1427 | *sig_len = rsa_alt->key_len_func(rsa_alt->key); |
| 1428 | if (*sig_len > MBEDTLS_PK_SIGNATURE_MAX_SIZE) { |
| 1429 | return MBEDTLS_ERR_PK_BAD_INPUT_DATA; |
| 1430 | } |
| 1431 | if (*sig_len > sig_size) { |
| 1432 | return MBEDTLS_ERR_PK_BUFFER_TOO_SMALL; |
| 1433 | } |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1434 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1435 | return rsa_alt->sign_func(rsa_alt->key, f_rng, p_rng, |
| 1436 | md_alg, (unsigned int) hash_len, hash, sig); |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1437 | } |
| 1438 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1439 | static int rsa_alt_decrypt_wrap(mbedtls_pk_context *pk, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1440 | const unsigned char *input, size_t ilen, |
| 1441 | unsigned char *output, size_t *olen, size_t osize, |
| 1442 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1443 | { |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1444 | mbedtls_rsa_alt_context *rsa_alt = pk->pk_ctx; |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1445 | |
| 1446 | ((void) f_rng); |
| 1447 | ((void) p_rng); |
| 1448 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1449 | if (ilen != rsa_alt->key_len_func(rsa_alt->key)) { |
| 1450 | return MBEDTLS_ERR_RSA_BAD_INPUT_DATA; |
| 1451 | } |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1452 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1453 | return rsa_alt->decrypt_func(rsa_alt->key, |
| 1454 | olen, input, output, osize); |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1455 | } |
| 1456 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 1457 | #if defined(MBEDTLS_RSA_C) |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1458 | static int rsa_alt_check_pair(mbedtls_pk_context *pub, mbedtls_pk_context *prv, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1459 | int (*f_rng)(void *, unsigned char *, size_t), |
| 1460 | void *p_rng) |
Manuel Pégourié-Gonnard | a1efcb0 | 2014-11-08 17:08:08 +0100 | [diff] [blame] | 1461 | { |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 1462 | unsigned char sig[MBEDTLS_MPI_MAX_SIZE]; |
Manuel Pégourié-Gonnard | a1efcb0 | 2014-11-08 17:08:08 +0100 | [diff] [blame] | 1463 | unsigned char hash[32]; |
| 1464 | size_t sig_len = 0; |
Janos Follath | 24eed8d | 2019-11-22 13:21:35 +0000 | [diff] [blame] | 1465 | int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; |
Manuel Pégourié-Gonnard | a1efcb0 | 2014-11-08 17:08:08 +0100 | [diff] [blame] | 1466 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1467 | if (rsa_alt_get_bitlen(prv) != rsa_get_bitlen(pub)) { |
| 1468 | return MBEDTLS_ERR_RSA_KEY_CHECK_FAILED; |
Manuel Pégourié-Gonnard | a1efcb0 | 2014-11-08 17:08:08 +0100 | [diff] [blame] | 1469 | } |
| 1470 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1471 | memset(hash, 0x2a, sizeof(hash)); |
| 1472 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1473 | if ((ret = rsa_alt_sign_wrap(prv, MBEDTLS_MD_NONE, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1474 | hash, sizeof(hash), |
| 1475 | sig, sizeof(sig), &sig_len, |
| 1476 | f_rng, p_rng)) != 0) { |
| 1477 | return ret; |
Manuel Pégourié-Gonnard | a1efcb0 | 2014-11-08 17:08:08 +0100 | [diff] [blame] | 1478 | } |
| 1479 | |
valerio | 38992cb | 2023-04-20 09:56:30 +0200 | [diff] [blame] | 1480 | if (rsa_verify_wrap(pub, MBEDTLS_MD_NONE, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1481 | hash, sizeof(hash), sig, sig_len) != 0) { |
| 1482 | return MBEDTLS_ERR_RSA_KEY_CHECK_FAILED; |
| 1483 | } |
| 1484 | |
| 1485 | return 0; |
Manuel Pégourié-Gonnard | a1efcb0 | 2014-11-08 17:08:08 +0100 | [diff] [blame] | 1486 | } |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 1487 | #endif /* MBEDTLS_RSA_C */ |
Manuel Pégourié-Gonnard | a1efcb0 | 2014-11-08 17:08:08 +0100 | [diff] [blame] | 1488 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1489 | static void *rsa_alt_alloc_wrap(void) |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1490 | { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1491 | void *ctx = mbedtls_calloc(1, sizeof(mbedtls_rsa_alt_context)); |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1492 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1493 | if (ctx != NULL) { |
| 1494 | memset(ctx, 0, sizeof(mbedtls_rsa_alt_context)); |
| 1495 | } |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1496 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1497 | return ctx; |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1498 | } |
| 1499 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1500 | static void rsa_alt_free_wrap(void *ctx) |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1501 | { |
Tom Cosgrove | ca8c61b | 2023-07-17 15:17:40 +0100 | [diff] [blame] | 1502 | mbedtls_zeroize_and_free(ctx, sizeof(mbedtls_rsa_alt_context)); |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1503 | } |
| 1504 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 1505 | const mbedtls_pk_info_t mbedtls_rsa_alt_info = { |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1506 | .type = MBEDTLS_PK_RSA_ALT, |
| 1507 | .name = "RSA-alt", |
| 1508 | .get_bitlen = rsa_alt_get_bitlen, |
| 1509 | .can_do = rsa_alt_can_do, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1510 | .verify_func = NULL, |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1511 | .sign_func = rsa_alt_sign_wrap, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1512 | #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) |
| 1513 | .verify_rs_func = NULL, |
| 1514 | .sign_rs_func = NULL, |
| 1515 | .rs_alloc_func = NULL, |
| 1516 | .rs_free_func = NULL, |
| 1517 | #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1518 | .decrypt_func = rsa_alt_decrypt_wrap, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1519 | .encrypt_func = NULL, |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 1520 | #if defined(MBEDTLS_RSA_C) |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1521 | .check_pair_func = rsa_alt_check_pair, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1522 | #else |
| 1523 | .check_pair_func = NULL, |
Manuel Pégourié-Gonnard | 7c13d69 | 2014-11-12 00:01:34 +0100 | [diff] [blame] | 1524 | #endif |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1525 | .ctx_alloc_func = rsa_alt_alloc_wrap, |
| 1526 | .ctx_free_func = rsa_alt_free_wrap, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1527 | .debug_func = NULL, |
Manuel Pégourié-Gonnard | 12c1ff0 | 2013-08-21 12:28:31 +0200 | [diff] [blame] | 1528 | }; |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 1529 | #endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */ |
Manuel Pégourié-Gonnard | 348bcb3 | 2015-03-31 14:01:33 +0200 | [diff] [blame] | 1530 | |
Manuel Pégourié-Gonnard | 20678b2 | 2018-10-22 12:11:15 +0200 | [diff] [blame] | 1531 | #if defined(MBEDTLS_USE_PSA_CRYPTO) |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1532 | static size_t opaque_get_bitlen(mbedtls_pk_context *pk) |
Manuel Pégourié-Gonnard | 0184b3c | 2018-10-31 10:36:51 +0100 | [diff] [blame] | 1533 | { |
Manuel Pégourié-Gonnard | 0184b3c | 2018-10-31 10:36:51 +0100 | [diff] [blame] | 1534 | size_t bits; |
Gilles Peskine | d2d45c1 | 2019-05-27 14:53:13 +0200 | [diff] [blame] | 1535 | psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; |
Manuel Pégourié-Gonnard | 0184b3c | 2018-10-31 10:36:51 +0100 | [diff] [blame] | 1536 | |
Valerio Setti | 4f387ef | 2023-05-02 14:15:59 +0200 | [diff] [blame] | 1537 | if (PSA_SUCCESS != psa_get_key_attributes(pk->priv_id, &attributes)) { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1538 | return 0; |
| 1539 | } |
Manuel Pégourié-Gonnard | 0184b3c | 2018-10-31 10:36:51 +0100 | [diff] [blame] | 1540 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1541 | bits = psa_get_key_bits(&attributes); |
| 1542 | psa_reset_key_attributes(&attributes); |
| 1543 | return bits; |
Manuel Pégourié-Gonnard | 0184b3c | 2018-10-31 10:36:51 +0100 | [diff] [blame] | 1544 | } |
| 1545 | |
Valerio Setti | 38913c1 | 2023-06-30 16:18:33 +0200 | [diff] [blame] | 1546 | #if defined(MBEDTLS_PK_HAVE_ECC_KEYS) |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1547 | static int ecdsa_opaque_can_do(mbedtls_pk_type_t type) |
Manuel Pégourié-Gonnard | 920c063 | 2018-10-31 10:57:29 +0100 | [diff] [blame] | 1548 | { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1549 | return type == MBEDTLS_PK_ECKEY || |
| 1550 | type == MBEDTLS_PK_ECDSA; |
Manuel Pégourié-Gonnard | 920c063 | 2018-10-31 10:57:29 +0100 | [diff] [blame] | 1551 | } |
| 1552 | |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1553 | const mbedtls_pk_info_t mbedtls_ecdsa_opaque_info = { |
Valerio Setti | 574a00b | 2023-06-21 19:47:37 +0200 | [diff] [blame] | 1554 | .type = MBEDTLS_PK_OPAQUE, |
| 1555 | .name = "Opaque", |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1556 | .get_bitlen = opaque_get_bitlen, |
| 1557 | .can_do = ecdsa_opaque_can_do, |
Valerio Setti | 4d1daf8 | 2023-06-26 13:31:18 +0200 | [diff] [blame] | 1558 | #if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY) |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1559 | .verify_func = ecdsa_opaque_verify_wrap, |
Valerio Setti | 4d1daf8 | 2023-06-26 13:31:18 +0200 | [diff] [blame] | 1560 | #else /* MBEDTLS_PK_CAN_ECDSA_VERIFY */ |
| 1561 | .verify_func = NULL, |
| 1562 | #endif /* MBEDTLS_PK_CAN_ECDSA_VERIFY */ |
| 1563 | #if defined(MBEDTLS_PK_CAN_ECDSA_SIGN) |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1564 | .sign_func = ecdsa_opaque_sign_wrap, |
Valerio Setti | 4d1daf8 | 2023-06-26 13:31:18 +0200 | [diff] [blame] | 1565 | #else /* MBEDTLS_PK_CAN_ECDSA_SIGN */ |
| 1566 | .sign_func = NULL, |
| 1567 | #endif /* MBEDTLS_PK_CAN_ECDSA_SIGN */ |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1568 | #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) |
| 1569 | .verify_rs_func = NULL, |
| 1570 | .sign_rs_func = NULL, |
| 1571 | .rs_alloc_func = NULL, |
| 1572 | .rs_free_func = NULL, |
| 1573 | #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ |
| 1574 | .decrypt_func = NULL, |
| 1575 | .encrypt_func = NULL, |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1576 | .check_pair_func = ecdsa_opaque_check_pair_wrap, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1577 | .ctx_alloc_func = NULL, |
| 1578 | .ctx_free_func = NULL, |
| 1579 | .debug_func = NULL, |
Valerio Setti | 574a00b | 2023-06-21 19:47:37 +0200 | [diff] [blame] | 1580 | }; |
Valerio Setti | 38913c1 | 2023-06-30 16:18:33 +0200 | [diff] [blame] | 1581 | #endif /* MBEDTLS_PK_HAVE_ECC_KEYS */ |
Valerio Setti | 574a00b | 2023-06-21 19:47:37 +0200 | [diff] [blame] | 1582 | |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1583 | static int rsa_opaque_can_do(mbedtls_pk_type_t type) |
Neil Armstrong | eabbf9d | 2022-03-15 12:01:26 +0100 | [diff] [blame] | 1584 | { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1585 | return type == MBEDTLS_PK_RSA || |
| 1586 | type == MBEDTLS_PK_RSASSA_PSS; |
Neil Armstrong | eabbf9d | 2022-03-15 12:01:26 +0100 | [diff] [blame] | 1587 | } |
| 1588 | |
Valerio Setti | f6d4dfb | 2023-07-10 10:55:12 +0200 | [diff] [blame] | 1589 | #if defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC) |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1590 | static int rsa_opaque_decrypt(mbedtls_pk_context *pk, |
| 1591 | const unsigned char *input, size_t ilen, |
| 1592 | unsigned char *output, size_t *olen, size_t osize, |
| 1593 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Manuel Pégourié-Gonnard | d8454bc | 2018-11-13 10:32:00 +0100 | [diff] [blame] | 1594 | { |
Valerio Setti | 574a00b | 2023-06-21 19:47:37 +0200 | [diff] [blame] | 1595 | psa_status_t status; |
| 1596 | |
| 1597 | /* PSA has its own RNG */ |
| 1598 | (void) f_rng; |
| 1599 | (void) p_rng; |
| 1600 | |
| 1601 | status = psa_asymmetric_decrypt(pk->priv_id, PSA_ALG_RSA_PKCS1V15_CRYPT, |
| 1602 | input, ilen, |
| 1603 | NULL, 0, |
| 1604 | output, osize, olen); |
| 1605 | if (status != PSA_SUCCESS) { |
| 1606 | return PSA_PK_RSA_TO_MBEDTLS_ERR(status); |
| 1607 | } |
| 1608 | |
| 1609 | return 0; |
| 1610 | } |
Valerio Setti | f6d4dfb | 2023-07-10 10:55:12 +0200 | [diff] [blame] | 1611 | #endif /* PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC */ |
Valerio Setti | 574a00b | 2023-06-21 19:47:37 +0200 | [diff] [blame] | 1612 | |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1613 | static int rsa_opaque_sign_wrap(mbedtls_pk_context *pk, mbedtls_md_type_t md_alg, |
| 1614 | const unsigned char *hash, size_t hash_len, |
| 1615 | unsigned char *sig, size_t sig_size, size_t *sig_len, |
| 1616 | int (*f_rng)(void *, unsigned char *, size_t), void *p_rng) |
Valerio Setti | 574a00b | 2023-06-21 19:47:37 +0200 | [diff] [blame] | 1617 | { |
| 1618 | #if defined(MBEDTLS_RSA_C) |
Neil Armstrong | eabbf9d | 2022-03-15 12:01:26 +0100 | [diff] [blame] | 1619 | psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; |
Neil Armstrong | b980c9b | 2022-03-15 16:19:16 +0100 | [diff] [blame] | 1620 | psa_algorithm_t alg; |
Neil Armstrong | eabbf9d | 2022-03-15 12:01:26 +0100 | [diff] [blame] | 1621 | psa_key_type_t type; |
Manuel Pégourié-Gonnard | d8454bc | 2018-11-13 10:32:00 +0100 | [diff] [blame] | 1622 | psa_status_t status; |
| 1623 | |
| 1624 | /* PSA has its own RNG */ |
| 1625 | (void) f_rng; |
| 1626 | (void) p_rng; |
| 1627 | |
Valerio Setti | 4f387ef | 2023-05-02 14:15:59 +0200 | [diff] [blame] | 1628 | status = psa_get_key_attributes(pk->priv_id, &attributes); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1629 | if (status != PSA_SUCCESS) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 1630 | return PSA_PK_TO_MBEDTLS_ERR(status); |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1631 | } |
Neil Armstrong | b980c9b | 2022-03-15 16:19:16 +0100 | [diff] [blame] | 1632 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1633 | type = psa_get_key_type(&attributes); |
| 1634 | psa_reset_key_attributes(&attributes); |
Neil Armstrong | b980c9b | 2022-03-15 16:19:16 +0100 | [diff] [blame] | 1635 | |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1636 | if (PSA_KEY_TYPE_IS_RSA(type)) { |
Manuel Pégourié-Gonnard | 2d6d993 | 2023-03-28 11:38:08 +0200 | [diff] [blame] | 1637 | alg = PSA_ALG_RSA_PKCS1V15_SIGN(mbedtls_md_psa_alg_from_type(md_alg)); |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 1638 | } else { |
| 1639 | return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE; |
| 1640 | } |
Neil Armstrong | b980c9b | 2022-03-15 16:19:16 +0100 | [diff] [blame] | 1641 | |
Manuel Pégourié-Gonnard | d8454bc | 2018-11-13 10:32:00 +0100 | [diff] [blame] | 1642 | /* make the signature */ |
Valerio Setti | 4f387ef | 2023-05-02 14:15:59 +0200 | [diff] [blame] | 1643 | status = psa_sign_hash(pk->priv_id, alg, hash, hash_len, |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1644 | sig, sig_size, sig_len); |
| 1645 | if (status != PSA_SUCCESS) { |
Gilles Peskine | 449bd83 | 2023-01-11 14:50:10 +0100 | [diff] [blame] | 1646 | if (PSA_KEY_TYPE_IS_RSA(type)) { |
Andrzej Kurek | 8a045ce | 2022-12-23 11:00:06 -0500 | [diff] [blame] | 1647 | return PSA_PK_RSA_TO_MBEDTLS_ERR(status); |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 1648 | } else { |
| 1649 | return PSA_PK_TO_MBEDTLS_ERR(status); |
| 1650 | } |
Neil Armstrong | b980c9b | 2022-03-15 16:19:16 +0100 | [diff] [blame] | 1651 | } |
Manuel Pégourié-Gonnard | d8454bc | 2018-11-13 10:32:00 +0100 | [diff] [blame] | 1652 | |
Neil Armstrong | b980c9b | 2022-03-15 16:19:16 +0100 | [diff] [blame] | 1653 | return 0; |
Valerio Setti | 574a00b | 2023-06-21 19:47:37 +0200 | [diff] [blame] | 1654 | #else /* !MBEDTLS_RSA_C */ |
| 1655 | ((void) pk); |
| 1656 | ((void) md_alg); |
| 1657 | ((void) hash); |
| 1658 | ((void) hash_len); |
| 1659 | ((void) sig); |
| 1660 | ((void) sig_size); |
| 1661 | ((void) sig_len); |
| 1662 | ((void) f_rng); |
| 1663 | ((void) p_rng); |
| 1664 | return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE; |
Valerio Setti | 4657f10 | 2023-06-21 13:55:16 +0200 | [diff] [blame] | 1665 | #endif /* !MBEDTLS_RSA_C */ |
Manuel Pégourié-Gonnard | d8454bc | 2018-11-13 10:32:00 +0100 | [diff] [blame] | 1666 | } |
| 1667 | |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1668 | const mbedtls_pk_info_t mbedtls_rsa_opaque_info = { |
Valerio Setti | f69514a | 2023-06-21 18:16:49 +0200 | [diff] [blame] | 1669 | .type = MBEDTLS_PK_OPAQUE, |
| 1670 | .name = "Opaque", |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1671 | .get_bitlen = opaque_get_bitlen, |
| 1672 | .can_do = rsa_opaque_can_do, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1673 | .verify_func = NULL, |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1674 | .sign_func = rsa_opaque_sign_wrap, |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1675 | #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) |
| 1676 | .verify_rs_func = NULL, |
| 1677 | .sign_rs_func = NULL, |
| 1678 | .rs_alloc_func = NULL, |
| 1679 | .rs_free_func = NULL, |
| 1680 | #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ |
Valerio Setti | f6d4dfb | 2023-07-10 10:55:12 +0200 | [diff] [blame] | 1681 | #if defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC) |
Valerio Setti | 76d0f96 | 2023-06-23 13:32:54 +0200 | [diff] [blame] | 1682 | .decrypt_func = rsa_opaque_decrypt, |
Valerio Setti | f6d4dfb | 2023-07-10 10:55:12 +0200 | [diff] [blame] | 1683 | #else /* PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC */ |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1684 | .decrypt_func = NULL, |
Valerio Setti | f6d4dfb | 2023-07-10 10:55:12 +0200 | [diff] [blame] | 1685 | #endif /* PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC */ |
Valerio Setti | 97976e3 | 2023-06-23 14:08:26 +0200 | [diff] [blame] | 1686 | .encrypt_func = NULL, |
| 1687 | .check_pair_func = NULL, |
| 1688 | .ctx_alloc_func = NULL, |
| 1689 | .ctx_free_func = NULL, |
| 1690 | .debug_func = NULL, |
Manuel Pégourié-Gonnard | 20678b2 | 2018-10-22 12:11:15 +0200 | [diff] [blame] | 1691 | }; |
| 1692 | |
| 1693 | #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
| 1694 | |
Manuel Pégourié-Gonnard | 2cf5a7c | 2015-04-08 12:49:31 +0200 | [diff] [blame] | 1695 | #endif /* MBEDTLS_PK_C */ |