2013-08-12 17:06:05 +02:00
|
|
|
/*
|
|
|
|
* Public Key abstraction layer: wrapper functions
|
|
|
|
*
|
2020-08-07 13:07:28 +02:00
|
|
|
* Copyright The Mbed TLS Contributors
|
2015-09-04 14:21:07 +02:00
|
|
|
* SPDX-License-Identifier: Apache-2.0
|
2013-08-12 17:06:05 +02:00
|
|
|
*
|
2015-09-04 14:21:07 +02:00
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
|
|
* not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
2013-08-12 17:06:05 +02:00
|
|
|
*
|
2015-09-04 14:21:07 +02:00
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
2013-08-12 17:06:05 +02:00
|
|
|
*
|
2015-09-04 14:21:07 +02:00
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
2013-08-12 17:06:05 +02:00
|
|
|
*/
|
|
|
|
|
2020-06-03 01:43:33 +02:00
|
|
|
#include "common.h"
|
2013-08-12 17:06:05 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_PK_C)
|
2015-05-26 11:04:15 +02:00
|
|
|
#include "mbedtls/pk_internal.h"
|
2019-11-22 14:21:35 +01:00
|
|
|
#include "mbedtls/error.h"
|
2013-08-12 17:06:05 +02:00
|
|
|
|
2013-08-22 17:33:21 +02:00
|
|
|
/* Even if RSA not activated, for the sake of RSA-alt */
|
2015-03-09 18:05:11 +01:00
|
|
|
#include "mbedtls/rsa.h"
|
2013-08-12 17:06:05 +02:00
|
|
|
|
2015-02-06 14:43:58 +01:00
|
|
|
#include <string.h>
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_ECP_C)
|
2015-03-09 18:05:11 +01:00
|
|
|
#include "mbedtls/ecp.h"
|
2013-08-12 17:06:05 +02:00
|
|
|
#endif
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C)
|
2015-03-09 18:05:11 +01:00
|
|
|
#include "mbedtls/ecdsa.h"
|
2013-08-12 17:06:05 +02:00
|
|
|
#endif
|
|
|
|
|
2018-10-31 16:22:49 +01:00
|
|
|
#if defined(MBEDTLS_USE_PSA_CRYPTO)
|
|
|
|
#include "mbedtls/asn1write.h"
|
|
|
|
#endif
|
|
|
|
|
2017-10-25 10:37:04 +02:00
|
|
|
#if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
|
2018-04-17 16:51:09 +02:00
|
|
|
#include "mbedtls/platform_util.h"
|
2017-10-25 10:37:04 +02:00
|
|
|
#endif
|
|
|
|
|
2018-10-31 16:22:49 +01:00
|
|
|
#if defined(MBEDTLS_USE_PSA_CRYPTO)
|
2018-10-31 10:16:46 +01:00
|
|
|
#include "psa/crypto.h"
|
2018-10-31 16:22:49 +01:00
|
|
|
#include "mbedtls/psa_util.h"
|
2018-10-31 10:16:46 +01:00
|
|
|
#include "mbedtls/asn1.h"
|
2018-10-31 16:22:49 +01:00
|
|
|
#endif
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_PLATFORM_C)
|
2015-03-09 18:05:11 +01:00
|
|
|
#include "mbedtls/platform.h"
|
2013-08-14 15:00:27 +02:00
|
|
|
#else
|
|
|
|
#include <stdlib.h>
|
2015-05-26 16:04:06 +02:00
|
|
|
#define mbedtls_calloc calloc
|
2015-04-08 12:49:31 +02:00
|
|
|
#define mbedtls_free free
|
2013-08-14 15:00:27 +02:00
|
|
|
#endif
|
|
|
|
|
2017-01-19 12:24:33 +01:00
|
|
|
#include <limits.h>
|
2017-08-04 14:32:15 +02:00
|
|
|
#include <stdint.h>
|
2014-06-13 17:20:13 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_RSA_C)
|
|
|
|
static int rsa_can_do( mbedtls_pk_type_t type )
|
2013-08-12 18:41:18 +02:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
return( type == MBEDTLS_PK_RSA ||
|
|
|
|
type == MBEDTLS_PK_RSASSA_PSS );
|
2013-08-12 18:41:18 +02:00
|
|
|
}
|
|
|
|
|
2015-06-18 16:06:55 +02:00
|
|
|
static size_t rsa_get_bitlen( const void *ctx )
|
2013-08-12 19:45:32 +02:00
|
|
|
{
|
2017-08-22 14:55:00 +02:00
|
|
|
const mbedtls_rsa_context * rsa = (const mbedtls_rsa_context *) ctx;
|
|
|
|
return( 8 * mbedtls_rsa_get_len( rsa ) );
|
2013-08-12 19:45:32 +02:00
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
static int rsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
2013-08-17 14:36:32 +02:00
|
|
|
const unsigned char *hash, size_t hash_len,
|
2013-08-12 17:06:05 +02:00
|
|
|
const unsigned char *sig, size_t sig_len )
|
|
|
|
{
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2017-08-22 14:55:00 +02:00
|
|
|
mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
|
|
|
|
size_t rsa_len = mbedtls_rsa_get_len( rsa );
|
2014-04-08 12:40:15 +02:00
|
|
|
|
2017-08-04 14:32:15 +02:00
|
|
|
#if SIZE_MAX > UINT_MAX
|
2017-01-19 12:24:33 +01:00
|
|
|
if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len )
|
|
|
|
return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
|
2017-08-04 14:32:15 +02:00
|
|
|
#endif /* SIZE_MAX > UINT_MAX */
|
2017-01-19 12:24:33 +01:00
|
|
|
|
2017-08-22 14:55:00 +02:00
|
|
|
if( sig_len < rsa_len )
|
2015-04-08 12:49:31 +02:00
|
|
|
return( MBEDTLS_ERR_RSA_VERIFY_FAILED );
|
2013-08-12 17:06:05 +02:00
|
|
|
|
2017-08-22 14:55:00 +02:00
|
|
|
if( ( ret = mbedtls_rsa_pkcs1_verify( rsa, NULL, NULL,
|
2015-04-08 12:49:31 +02:00
|
|
|
MBEDTLS_RSA_PUBLIC, md_alg,
|
2014-04-08 12:40:15 +02:00
|
|
|
(unsigned int) hash_len, hash, sig ) ) != 0 )
|
|
|
|
return( ret );
|
|
|
|
|
2018-03-30 07:12:15 +02:00
|
|
|
/* The buffer contains a valid signature followed by extra data.
|
|
|
|
* We have a special error code for that so that so that callers can
|
|
|
|
* use mbedtls_pk_verify() to check "Does the buffer start with a
|
|
|
|
* valid signature?" and not just "Does the buffer contain a valid
|
|
|
|
* signature?". */
|
2017-08-22 14:55:00 +02:00
|
|
|
if( sig_len > rsa_len )
|
2015-04-08 12:49:31 +02:00
|
|
|
return( MBEDTLS_ERR_PK_SIG_LEN_MISMATCH );
|
2014-04-08 12:40:15 +02:00
|
|
|
|
|
|
|
return( 0 );
|
2013-08-12 17:06:05 +02:00
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
static int rsa_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
2013-08-21 10:34:38 +02:00
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
unsigned char *sig, size_t *sig_len,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
|
|
|
|
{
|
2017-08-22 14:55:00 +02:00
|
|
|
mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
|
|
|
|
|
2017-08-04 14:32:15 +02:00
|
|
|
#if SIZE_MAX > UINT_MAX
|
2017-01-19 12:24:33 +01:00
|
|
|
if( md_alg == MBEDTLS_MD_NONE && UINT_MAX < hash_len )
|
|
|
|
return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
|
2017-08-04 14:32:15 +02:00
|
|
|
#endif /* SIZE_MAX > UINT_MAX */
|
2017-01-19 12:24:33 +01:00
|
|
|
|
2017-08-22 14:55:00 +02:00
|
|
|
*sig_len = mbedtls_rsa_get_len( rsa );
|
2013-08-21 10:34:38 +02:00
|
|
|
|
2017-08-22 14:55:00 +02:00
|
|
|
return( mbedtls_rsa_pkcs1_sign( rsa, f_rng, p_rng, MBEDTLS_RSA_PRIVATE,
|
2013-10-11 18:58:55 +02:00
|
|
|
md_alg, (unsigned int) hash_len, hash, sig ) );
|
2013-08-21 10:34:38 +02:00
|
|
|
}
|
|
|
|
|
2013-08-21 11:51:08 +02:00
|
|
|
static int rsa_decrypt_wrap( void *ctx,
|
|
|
|
const unsigned char *input, size_t ilen,
|
|
|
|
unsigned char *output, size_t *olen, size_t osize,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
|
|
|
|
{
|
2017-08-22 14:55:00 +02:00
|
|
|
mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
|
|
|
|
|
|
|
|
if( ilen != mbedtls_rsa_get_len( rsa ) )
|
2015-04-08 12:49:31 +02:00
|
|
|
return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
|
2013-08-21 11:51:08 +02:00
|
|
|
|
2017-08-22 14:55:00 +02:00
|
|
|
return( mbedtls_rsa_pkcs1_decrypt( rsa, f_rng, p_rng,
|
2015-04-08 12:49:31 +02:00
|
|
|
MBEDTLS_RSA_PRIVATE, olen, input, output, osize ) );
|
2013-08-21 11:51:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int rsa_encrypt_wrap( void *ctx,
|
|
|
|
const unsigned char *input, size_t ilen,
|
|
|
|
unsigned char *output, size_t *olen, size_t osize,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
|
|
|
|
{
|
2017-08-22 14:55:00 +02:00
|
|
|
mbedtls_rsa_context * rsa = (mbedtls_rsa_context *) ctx;
|
|
|
|
*olen = mbedtls_rsa_get_len( rsa );
|
2013-08-21 11:51:08 +02:00
|
|
|
|
2014-11-08 17:08:08 +01:00
|
|
|
if( *olen > osize )
|
2015-04-08 12:49:31 +02:00
|
|
|
return( MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE );
|
2014-11-08 17:08:08 +01:00
|
|
|
|
2017-08-22 14:55:00 +02:00
|
|
|
return( mbedtls_rsa_pkcs1_encrypt( rsa, f_rng, p_rng, MBEDTLS_RSA_PUBLIC,
|
|
|
|
ilen, input, output ) );
|
2013-08-21 11:51:08 +02:00
|
|
|
}
|
|
|
|
|
2014-11-06 16:51:20 +01:00
|
|
|
static int rsa_check_pair_wrap( const void *pub, const void *prv )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
return( mbedtls_rsa_check_pub_priv( (const mbedtls_rsa_context *) pub,
|
|
|
|
(const mbedtls_rsa_context *) prv ) );
|
2014-11-06 16:51:20 +01:00
|
|
|
}
|
|
|
|
|
2013-08-14 15:00:27 +02:00
|
|
|
static void *rsa_alloc_wrap( void )
|
|
|
|
{
|
2015-05-26 16:04:06 +02:00
|
|
|
void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_rsa_context ) );
|
2013-08-14 15:00:27 +02:00
|
|
|
|
|
|
|
if( ctx != NULL )
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_rsa_init( (mbedtls_rsa_context *) ctx, 0, 0 );
|
2013-08-14 15:00:27 +02:00
|
|
|
|
2014-06-17 14:06:49 +02:00
|
|
|
return( ctx );
|
2013-08-14 15:00:27 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void rsa_free_wrap( void *ctx )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_rsa_free( (mbedtls_rsa_context *) ctx );
|
|
|
|
mbedtls_free( ctx );
|
2013-08-14 15:00:27 +02:00
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
static void rsa_debug( const void *ctx, mbedtls_pk_debug_item *items )
|
2013-08-14 18:04:18 +02:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
items->type = MBEDTLS_PK_DEBUG_MPI;
|
2013-08-14 18:04:18 +02:00
|
|
|
items->name = "rsa.N";
|
2015-04-08 12:49:31 +02:00
|
|
|
items->value = &( ((mbedtls_rsa_context *) ctx)->N );
|
2013-08-14 18:04:18 +02:00
|
|
|
|
|
|
|
items++;
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
items->type = MBEDTLS_PK_DEBUG_MPI;
|
2013-08-14 18:04:18 +02:00
|
|
|
items->name = "rsa.E";
|
2015-04-08 12:49:31 +02:00
|
|
|
items->value = &( ((mbedtls_rsa_context *) ctx)->E );
|
2013-08-14 18:04:18 +02:00
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
const mbedtls_pk_info_t mbedtls_rsa_info = {
|
|
|
|
MBEDTLS_PK_RSA,
|
2013-08-12 19:45:32 +02:00
|
|
|
"RSA",
|
2015-06-18 16:06:55 +02:00
|
|
|
rsa_get_bitlen,
|
2013-08-12 18:41:18 +02:00
|
|
|
rsa_can_do,
|
2013-08-12 17:06:05 +02:00
|
|
|
rsa_verify_wrap,
|
2013-08-21 10:34:38 +02:00
|
|
|
rsa_sign_wrap,
|
2017-08-18 17:30:37 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
|
2017-05-09 10:42:40 +02:00
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
#endif
|
2013-08-21 11:51:08 +02:00
|
|
|
rsa_decrypt_wrap,
|
|
|
|
rsa_encrypt_wrap,
|
2014-11-06 16:51:20 +01:00
|
|
|
rsa_check_pair_wrap,
|
2013-08-14 15:00:27 +02:00
|
|
|
rsa_alloc_wrap,
|
|
|
|
rsa_free_wrap,
|
2017-08-18 17:30:37 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
|
2017-08-18 16:22:06 +02:00
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
#endif
|
2013-08-14 18:04:18 +02:00
|
|
|
rsa_debug,
|
2013-08-12 17:06:05 +02:00
|
|
|
};
|
2015-04-08 12:49:31 +02:00
|
|
|
#endif /* MBEDTLS_RSA_C */
|
2013-08-12 17:06:05 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_ECP_C)
|
2013-08-12 18:51:26 +02:00
|
|
|
/*
|
|
|
|
* Generic EC key
|
|
|
|
*/
|
2015-04-08 12:49:31 +02:00
|
|
|
static int eckey_can_do( mbedtls_pk_type_t type )
|
2013-08-12 18:41:18 +02:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
return( type == MBEDTLS_PK_ECKEY ||
|
|
|
|
type == MBEDTLS_PK_ECKEY_DH ||
|
|
|
|
type == MBEDTLS_PK_ECDSA );
|
2013-08-12 18:41:18 +02:00
|
|
|
}
|
|
|
|
|
2015-06-18 16:06:55 +02:00
|
|
|
static size_t eckey_get_bitlen( const void *ctx )
|
2013-08-12 19:45:32 +02:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
return( ((mbedtls_ecp_keypair *) ctx)->grp.pbits );
|
2013-08-12 19:45:32 +02:00
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C)
|
2013-08-21 10:34:38 +02:00
|
|
|
/* Forward declarations */
|
2015-04-08 12:49:31 +02:00
|
|
|
static int ecdsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
2013-08-17 14:36:32 +02:00
|
|
|
const unsigned char *hash, size_t hash_len,
|
2013-08-14 18:16:50 +02:00
|
|
|
const unsigned char *sig, size_t sig_len );
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
static int ecdsa_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
2013-08-21 10:34:38 +02:00
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
unsigned char *sig, size_t *sig_len,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng );
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
static int eckey_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
2013-08-17 14:36:32 +02:00
|
|
|
const unsigned char *hash, size_t hash_len,
|
2013-08-12 17:06:05 +02:00
|
|
|
const unsigned char *sig, size_t sig_len )
|
|
|
|
{
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_ecdsa_context ecdsa;
|
2013-08-12 17:06:05 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_ecdsa_init( &ecdsa );
|
2013-08-12 17:06:05 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
if( ( ret = mbedtls_ecdsa_from_keypair( &ecdsa, ctx ) ) == 0 )
|
2013-08-20 16:58:13 +02:00
|
|
|
ret = ecdsa_verify_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len );
|
2013-08-12 17:06:05 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_ecdsa_free( &ecdsa );
|
2013-08-12 17:06:05 +02:00
|
|
|
|
|
|
|
return( ret );
|
|
|
|
}
|
2013-08-21 10:34:38 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
static int eckey_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
2013-08-21 10:34:38 +02:00
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
unsigned char *sig, size_t *sig_len,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
|
|
|
|
{
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_ecdsa_context ecdsa;
|
2013-08-21 10:34:38 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_ecdsa_init( &ecdsa );
|
2013-08-21 10:34:38 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
if( ( ret = mbedtls_ecdsa_from_keypair( &ecdsa, ctx ) ) == 0 )
|
2013-08-21 10:34:38 +02:00
|
|
|
ret = ecdsa_sign_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len,
|
|
|
|
f_rng, p_rng );
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_ecdsa_free( &ecdsa );
|
2013-08-21 10:34:38 +02:00
|
|
|
|
|
|
|
return( ret );
|
|
|
|
}
|
|
|
|
|
2017-05-09 10:42:40 +02:00
|
|
|
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
|
|
|
/* Forward declarations */
|
|
|
|
static int ecdsa_verify_rs_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
const unsigned char *sig, size_t sig_len,
|
|
|
|
void *rs_ctx );
|
|
|
|
|
|
|
|
static int ecdsa_sign_rs_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
unsigned char *sig, size_t *sig_len,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
|
|
|
|
void *rs_ctx );
|
|
|
|
|
2017-08-18 17:04:07 +02:00
|
|
|
/*
|
|
|
|
* Restart context for ECDSA operations with ECKEY context
|
|
|
|
*
|
|
|
|
* We need to store an actual ECDSA context, as we need to pass the same to
|
|
|
|
* the underlying ecdsa function, so we can't create it on the fly every time.
|
|
|
|
*/
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
mbedtls_ecdsa_restart_ctx ecdsa_rs;
|
|
|
|
mbedtls_ecdsa_context ecdsa_ctx;
|
|
|
|
} eckey_restart_ctx;
|
|
|
|
|
|
|
|
static void *eckey_rs_alloc( void )
|
|
|
|
{
|
|
|
|
eckey_restart_ctx *rs_ctx;
|
|
|
|
|
|
|
|
void *ctx = mbedtls_calloc( 1, sizeof( eckey_restart_ctx ) );
|
|
|
|
|
|
|
|
if( ctx != NULL )
|
|
|
|
{
|
|
|
|
rs_ctx = ctx;
|
|
|
|
mbedtls_ecdsa_restart_init( &rs_ctx->ecdsa_rs );
|
|
|
|
mbedtls_ecdsa_init( &rs_ctx->ecdsa_ctx );
|
|
|
|
}
|
|
|
|
|
|
|
|
return( ctx );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void eckey_rs_free( void *ctx )
|
|
|
|
{
|
|
|
|
eckey_restart_ctx *rs_ctx;
|
|
|
|
|
|
|
|
if( ctx == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
rs_ctx = ctx;
|
|
|
|
mbedtls_ecdsa_restart_free( &rs_ctx->ecdsa_rs );
|
|
|
|
mbedtls_ecdsa_free( &rs_ctx->ecdsa_ctx );
|
|
|
|
|
|
|
|
mbedtls_free( ctx );
|
|
|
|
}
|
|
|
|
|
2017-05-09 10:42:40 +02:00
|
|
|
static int eckey_verify_rs_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
const unsigned char *sig, size_t sig_len,
|
2017-08-18 17:04:07 +02:00
|
|
|
void *rs_ctx )
|
2017-05-09 10:42:40 +02:00
|
|
|
{
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2017-08-18 17:04:07 +02:00
|
|
|
eckey_restart_ctx *rs = rs_ctx;
|
2017-05-09 10:42:40 +02:00
|
|
|
|
2017-08-18 17:04:07 +02:00
|
|
|
/* Should never happen */
|
|
|
|
if( rs == NULL )
|
|
|
|
return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
|
2017-05-09 10:42:40 +02:00
|
|
|
|
2018-10-15 15:27:49 +02:00
|
|
|
/* set up our own sub-context if needed (that is, on first run) */
|
2017-08-18 17:04:07 +02:00
|
|
|
if( rs->ecdsa_ctx.grp.pbits == 0 )
|
|
|
|
MBEDTLS_MPI_CHK( mbedtls_ecdsa_from_keypair( &rs->ecdsa_ctx, ctx ) );
|
2017-05-09 10:42:40 +02:00
|
|
|
|
2017-08-18 17:04:07 +02:00
|
|
|
MBEDTLS_MPI_CHK( ecdsa_verify_rs_wrap( &rs->ecdsa_ctx,
|
|
|
|
md_alg, hash, hash_len,
|
|
|
|
sig, sig_len, &rs->ecdsa_rs ) );
|
2017-05-09 10:42:40 +02:00
|
|
|
|
|
|
|
cleanup:
|
|
|
|
return( ret );
|
|
|
|
}
|
|
|
|
|
|
|
|
static int eckey_sign_rs_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
unsigned char *sig, size_t *sig_len,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
|
2017-08-18 17:04:07 +02:00
|
|
|
void *rs_ctx )
|
2017-05-09 10:42:40 +02:00
|
|
|
{
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2017-08-18 17:04:07 +02:00
|
|
|
eckey_restart_ctx *rs = rs_ctx;
|
2017-05-09 10:42:40 +02:00
|
|
|
|
2017-08-18 17:04:07 +02:00
|
|
|
/* Should never happen */
|
|
|
|
if( rs == NULL )
|
|
|
|
return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
|
2017-05-09 10:42:40 +02:00
|
|
|
|
2018-10-15 15:27:49 +02:00
|
|
|
/* set up our own sub-context if needed (that is, on first run) */
|
2017-08-18 17:04:07 +02:00
|
|
|
if( rs->ecdsa_ctx.grp.pbits == 0 )
|
|
|
|
MBEDTLS_MPI_CHK( mbedtls_ecdsa_from_keypair( &rs->ecdsa_ctx, ctx ) );
|
2017-05-09 10:42:40 +02:00
|
|
|
|
2017-08-18 17:04:07 +02:00
|
|
|
MBEDTLS_MPI_CHK( ecdsa_sign_rs_wrap( &rs->ecdsa_ctx, md_alg,
|
|
|
|
hash, hash_len, sig, sig_len,
|
|
|
|
f_rng, p_rng, &rs->ecdsa_rs ) );
|
2017-05-09 10:42:40 +02:00
|
|
|
|
|
|
|
cleanup:
|
|
|
|
return( ret );
|
|
|
|
}
|
|
|
|
#endif /* MBEDTLS_ECP_RESTARTABLE */
|
2015-04-08 12:49:31 +02:00
|
|
|
#endif /* MBEDTLS_ECDSA_C */
|
2013-08-12 17:06:05 +02:00
|
|
|
|
2014-11-06 16:51:20 +01:00
|
|
|
static int eckey_check_pair( const void *pub, const void *prv )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
return( mbedtls_ecp_check_pub_priv( (const mbedtls_ecp_keypair *) pub,
|
|
|
|
(const mbedtls_ecp_keypair *) prv ) );
|
2014-11-06 16:51:20 +01:00
|
|
|
}
|
|
|
|
|
2013-08-14 15:00:27 +02:00
|
|
|
static void *eckey_alloc_wrap( void )
|
|
|
|
{
|
2015-05-26 16:04:06 +02:00
|
|
|
void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_ecp_keypair ) );
|
2013-08-14 15:00:27 +02:00
|
|
|
|
|
|
|
if( ctx != NULL )
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_ecp_keypair_init( ctx );
|
2013-08-14 15:00:27 +02:00
|
|
|
|
|
|
|
return( ctx );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void eckey_free_wrap( void *ctx )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_ecp_keypair_free( (mbedtls_ecp_keypair *) ctx );
|
|
|
|
mbedtls_free( ctx );
|
2013-08-14 15:00:27 +02:00
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
static void eckey_debug( const void *ctx, mbedtls_pk_debug_item *items )
|
2013-08-14 18:04:18 +02:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
items->type = MBEDTLS_PK_DEBUG_ECP;
|
2013-08-14 18:04:18 +02:00
|
|
|
items->name = "eckey.Q";
|
2015-04-08 12:49:31 +02:00
|
|
|
items->value = &( ((mbedtls_ecp_keypair *) ctx)->Q );
|
2013-08-14 18:04:18 +02:00
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
const mbedtls_pk_info_t mbedtls_eckey_info = {
|
|
|
|
MBEDTLS_PK_ECKEY,
|
2013-08-12 19:45:32 +02:00
|
|
|
"EC",
|
2015-06-18 16:06:55 +02:00
|
|
|
eckey_get_bitlen,
|
2013-08-12 18:41:18 +02:00
|
|
|
eckey_can_do,
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C)
|
2013-08-12 17:06:05 +02:00
|
|
|
eckey_verify_wrap,
|
2013-08-21 10:34:38 +02:00
|
|
|
eckey_sign_wrap,
|
2017-05-09 10:42:40 +02:00
|
|
|
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
|
|
|
eckey_verify_rs_wrap,
|
|
|
|
eckey_sign_rs_wrap,
|
|
|
|
#endif
|
|
|
|
#else /* MBEDTLS_ECDSA_C */
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
#endif /* MBEDTLS_ECDSA_C */
|
2013-08-21 11:51:08 +02:00
|
|
|
NULL,
|
|
|
|
NULL,
|
2014-11-06 16:51:20 +01:00
|
|
|
eckey_check_pair,
|
2013-08-14 15:00:27 +02:00
|
|
|
eckey_alloc_wrap,
|
|
|
|
eckey_free_wrap,
|
2017-08-18 17:30:37 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
|
2017-08-18 16:22:06 +02:00
|
|
|
eckey_rs_alloc,
|
|
|
|
eckey_rs_free,
|
|
|
|
#endif
|
2013-08-14 18:04:18 +02:00
|
|
|
eckey_debug,
|
2013-08-12 17:06:05 +02:00
|
|
|
};
|
2013-08-12 18:51:26 +02:00
|
|
|
|
|
|
|
/*
|
2014-04-08 17:35:40 +02:00
|
|
|
* EC key restricted to ECDH
|
2013-08-12 18:51:26 +02:00
|
|
|
*/
|
2015-04-08 12:49:31 +02:00
|
|
|
static int eckeydh_can_do( mbedtls_pk_type_t type )
|
2013-08-12 18:51:26 +02:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
return( type == MBEDTLS_PK_ECKEY ||
|
|
|
|
type == MBEDTLS_PK_ECKEY_DH );
|
2013-08-12 18:51:26 +02:00
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
const mbedtls_pk_info_t mbedtls_eckeydh_info = {
|
|
|
|
MBEDTLS_PK_ECKEY_DH,
|
2013-08-12 19:45:32 +02:00
|
|
|
"EC_DH",
|
2015-06-18 16:06:55 +02:00
|
|
|
eckey_get_bitlen, /* Same underlying key structure */
|
2013-08-12 18:51:26 +02:00
|
|
|
eckeydh_can_do,
|
2013-08-17 15:20:06 +02:00
|
|
|
NULL,
|
2013-08-21 10:34:38 +02:00
|
|
|
NULL,
|
2017-08-18 17:30:37 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
|
2017-05-09 10:42:40 +02:00
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
#endif
|
2013-08-21 11:51:08 +02:00
|
|
|
NULL,
|
|
|
|
NULL,
|
2014-11-06 16:51:20 +01:00
|
|
|
eckey_check_pair,
|
2013-08-14 15:00:27 +02:00
|
|
|
eckey_alloc_wrap, /* Same underlying key structure */
|
|
|
|
eckey_free_wrap, /* Same underlying key structure */
|
2017-08-18 17:30:37 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
|
2017-08-18 16:22:06 +02:00
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
#endif
|
2013-08-14 18:16:50 +02:00
|
|
|
eckey_debug, /* Same underlying key structure */
|
2013-08-12 18:51:26 +02:00
|
|
|
};
|
2015-04-08 12:49:31 +02:00
|
|
|
#endif /* MBEDTLS_ECP_C */
|
2013-08-14 18:16:50 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C)
|
|
|
|
static int ecdsa_can_do( mbedtls_pk_type_t type )
|
2013-08-14 18:16:50 +02:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
return( type == MBEDTLS_PK_ECDSA );
|
2013-08-14 18:16:50 +02:00
|
|
|
}
|
|
|
|
|
2018-10-31 10:16:46 +01:00
|
|
|
#if defined(MBEDTLS_USE_PSA_CRYPTO)
|
|
|
|
/*
|
2018-11-20 11:04:35 +01:00
|
|
|
* An ASN.1 encoded signature is a sequence of two ASN.1 integers. Parse one of
|
|
|
|
* those integers and convert it to the fixed-length encoding expected by PSA.
|
2018-10-31 10:16:46 +01:00
|
|
|
*/
|
2018-11-20 11:04:35 +01:00
|
|
|
static int extract_ecdsa_sig_int( unsigned char **from, const unsigned char *end,
|
|
|
|
unsigned char *to, size_t to_len )
|
2018-10-31 10:16:46 +01:00
|
|
|
{
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2018-11-20 11:04:35 +01:00
|
|
|
size_t unpadded_len, padding_len;
|
2018-11-07 15:30:50 +01:00
|
|
|
|
2018-11-20 11:04:35 +01:00
|
|
|
if( ( ret = mbedtls_asn1_get_tag( from, end, &unpadded_len,
|
2018-11-19 23:01:16 +01:00
|
|
|
MBEDTLS_ASN1_INTEGER ) ) != 0 )
|
2018-11-06 14:50:04 +01:00
|
|
|
{
|
2018-11-19 23:01:16 +01:00
|
|
|
return( ret );
|
2018-11-06 14:50:04 +01:00
|
|
|
}
|
2018-10-31 10:16:46 +01:00
|
|
|
|
2018-11-20 11:04:35 +01:00
|
|
|
while( unpadded_len > 0 && **from == 0x00 )
|
2018-11-06 14:50:04 +01:00
|
|
|
{
|
2018-11-19 23:01:16 +01:00
|
|
|
( *from )++;
|
2018-11-20 11:04:35 +01:00
|
|
|
unpadded_len--;
|
2018-10-31 10:16:46 +01:00
|
|
|
}
|
|
|
|
|
2018-11-20 11:04:35 +01:00
|
|
|
if( unpadded_len > to_len || unpadded_len == 0 )
|
|
|
|
return( MBEDTLS_ERR_ASN1_LENGTH_MISMATCH );
|
2018-10-31 10:16:46 +01:00
|
|
|
|
2018-11-20 11:04:35 +01:00
|
|
|
padding_len = to_len - unpadded_len;
|
2018-11-20 11:14:46 +01:00
|
|
|
memset( to, 0x00, padding_len );
|
2018-11-20 11:04:35 +01:00
|
|
|
memcpy( to + padding_len, *from, unpadded_len );
|
|
|
|
( *from ) += unpadded_len;
|
2018-11-19 23:01:16 +01:00
|
|
|
|
2018-11-20 11:04:35 +01:00
|
|
|
return( 0 );
|
2018-11-19 23:01:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Convert a signature from an ASN.1 sequence of two integers
|
2018-11-20 11:04:35 +01:00
|
|
|
* to a raw {r,s} buffer. Note: the provided sig buffer must be at least
|
2018-11-19 23:41:58 +01:00
|
|
|
* twice as big as int_size.
|
2018-11-19 23:01:16 +01:00
|
|
|
*/
|
|
|
|
static int extract_ecdsa_sig( unsigned char **p, const unsigned char *end,
|
2018-11-20 11:04:35 +01:00
|
|
|
unsigned char *sig, size_t int_size )
|
2018-11-19 23:01:16 +01:00
|
|
|
{
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2018-11-20 11:04:35 +01:00
|
|
|
size_t tmp_size;
|
2018-11-19 23:01:16 +01:00
|
|
|
|
2018-11-20 11:04:35 +01:00
|
|
|
if( ( ret = mbedtls_asn1_get_tag( p, end, &tmp_size,
|
2018-11-19 23:01:16 +01:00
|
|
|
MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 )
|
2018-11-20 11:04:35 +01:00
|
|
|
return( ret );
|
2018-10-31 10:16:46 +01:00
|
|
|
|
2018-11-19 23:01:16 +01:00
|
|
|
/* Extract r */
|
2018-11-20 11:04:35 +01:00
|
|
|
if( ( ret = extract_ecdsa_sig_int( p, end, sig, int_size ) ) != 0 )
|
|
|
|
return( ret );
|
2018-11-19 23:01:16 +01:00
|
|
|
/* Extract s */
|
2018-11-20 11:04:35 +01:00
|
|
|
if( ( ret = extract_ecdsa_sig_int( p, end, sig + int_size, int_size ) ) != 0 )
|
|
|
|
return( ret );
|
2018-11-07 15:30:50 +01:00
|
|
|
|
2018-10-31 10:16:46 +01:00
|
|
|
return( 0 );
|
|
|
|
}
|
|
|
|
|
2019-12-12 17:50:44 +01:00
|
|
|
static int ecdsa_verify_wrap( void *ctx_arg, mbedtls_md_type_t md_alg,
|
2018-10-31 10:16:46 +01:00
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
const unsigned char *sig, size_t sig_len )
|
|
|
|
{
|
2019-12-12 17:50:44 +01:00
|
|
|
mbedtls_ecdsa_context *ctx = ctx_arg;
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2019-05-27 14:53:13 +02:00
|
|
|
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
|
|
|
|
psa_key_handle_t key_handle = 0;
|
|
|
|
psa_status_t status;
|
2018-10-31 10:16:46 +01:00
|
|
|
mbedtls_pk_context key;
|
|
|
|
int key_len;
|
2018-11-20 11:04:35 +01:00
|
|
|
/* see ECP_PUB_DER_MAX_BYTES in pkwrite.c */
|
|
|
|
unsigned char buf[30 + 2 * MBEDTLS_ECP_MAX_BYTES];
|
2019-01-25 17:37:10 +01:00
|
|
|
unsigned char *p;
|
2018-10-31 10:16:46 +01:00
|
|
|
mbedtls_pk_info_t pk_info = mbedtls_eckey_info;
|
2018-11-20 11:04:35 +01:00
|
|
|
psa_algorithm_t psa_sig_md, psa_md;
|
2019-12-12 17:50:44 +01:00
|
|
|
size_t curve_bits;
|
2020-06-02 18:19:28 +02:00
|
|
|
psa_ecc_family_t curve =
|
2019-12-12 17:50:44 +01:00
|
|
|
mbedtls_ecc_group_to_psa( ctx->grp.id, &curve_bits );
|
|
|
|
const size_t signature_part_size = ( ctx->grp.nbits + 7 ) / 8;
|
2018-10-31 10:16:46 +01:00
|
|
|
|
2018-11-07 14:18:52 +01:00
|
|
|
if( curve == 0 )
|
|
|
|
return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
|
|
|
|
|
2019-01-29 09:26:15 +01:00
|
|
|
/* mbedtls_pk_write_pubkey() expects a full PK context;
|
2018-11-20 11:04:35 +01:00
|
|
|
* re-construct one to make it happy */
|
2018-10-31 10:16:46 +01:00
|
|
|
key.pk_info = &pk_info;
|
|
|
|
key.pk_ctx = ctx;
|
2019-01-25 17:37:10 +01:00
|
|
|
p = buf + sizeof( buf );
|
|
|
|
key_len = mbedtls_pk_write_pubkey( &p, buf, &key );
|
2018-10-31 10:16:46 +01:00
|
|
|
if( key_len <= 0 )
|
2018-11-08 10:33:06 +01:00
|
|
|
return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
|
2018-10-31 10:16:46 +01:00
|
|
|
|
2018-11-20 11:04:35 +01:00
|
|
|
psa_md = mbedtls_psa_translate_md( md_alg );
|
|
|
|
if( psa_md == 0 )
|
|
|
|
return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
|
|
|
|
psa_sig_md = PSA_ALG_ECDSA( psa_md );
|
2019-01-08 15:36:01 +01:00
|
|
|
|
2019-05-27 14:53:13 +02:00
|
|
|
psa_set_key_type( &attributes, PSA_KEY_TYPE_ECC_PUBLIC_KEY( curve ) );
|
2019-11-26 17:01:59 +01:00
|
|
|
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_VERIFY_HASH );
|
2019-05-27 14:53:13 +02:00
|
|
|
psa_set_key_algorithm( &attributes, psa_sig_md );
|
2018-10-31 10:16:46 +01:00
|
|
|
|
2019-05-27 14:53:13 +02:00
|
|
|
status = psa_import_key( &attributes,
|
|
|
|
buf + sizeof( buf ) - key_len, key_len,
|
|
|
|
&key_handle );
|
|
|
|
if( status != PSA_SUCCESS )
|
2018-10-31 10:16:46 +01:00
|
|
|
{
|
2019-05-27 14:53:13 +02:00
|
|
|
ret = mbedtls_psa_err_translate_pk( status );
|
2018-10-31 10:16:46 +01:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2018-11-20 12:39:06 +01:00
|
|
|
/* We don't need the exported key anymore and can
|
|
|
|
* reuse its buffer for signature extraction. */
|
2018-11-20 11:04:35 +01:00
|
|
|
if( 2 * signature_part_size > sizeof( buf ) )
|
2018-11-19 23:41:58 +01:00
|
|
|
{
|
|
|
|
ret = MBEDTLS_ERR_PK_BAD_INPUT_DATA;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2019-01-25 17:37:10 +01:00
|
|
|
p = (unsigned char*) sig;
|
2018-11-20 12:39:06 +01:00
|
|
|
if( ( ret = extract_ecdsa_sig( &p, sig + sig_len, buf,
|
2018-11-19 23:41:58 +01:00
|
|
|
signature_part_size ) ) != 0 )
|
|
|
|
{
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2019-11-26 17:01:59 +01:00
|
|
|
if( psa_verify_hash( key_handle, psa_sig_md,
|
|
|
|
hash, hash_len,
|
|
|
|
buf, 2 * signature_part_size )
|
2018-10-31 10:16:46 +01:00
|
|
|
!= PSA_SUCCESS )
|
|
|
|
{
|
|
|
|
ret = MBEDTLS_ERR_ECP_VERIFY_FAILED;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2018-11-20 13:59:18 +01:00
|
|
|
|
|
|
|
if( p != sig + sig_len )
|
|
|
|
{
|
|
|
|
ret = MBEDTLS_ERR_PK_SIG_LEN_MISMATCH;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2018-10-31 10:16:46 +01:00
|
|
|
ret = 0;
|
|
|
|
|
2018-11-19 23:01:16 +01:00
|
|
|
cleanup:
|
2019-05-27 14:53:13 +02:00
|
|
|
psa_destroy_key( key_handle );
|
2018-10-31 10:16:46 +01:00
|
|
|
return( ret );
|
|
|
|
}
|
|
|
|
#else /* MBEDTLS_USE_PSA_CRYPTO */
|
2015-04-08 12:49:31 +02:00
|
|
|
static int ecdsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
2013-08-17 14:36:32 +02:00
|
|
|
const unsigned char *hash, size_t hash_len,
|
2013-08-14 18:16:50 +02:00
|
|
|
const unsigned char *sig, size_t sig_len )
|
|
|
|
{
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2013-08-17 14:36:32 +02:00
|
|
|
((void) md_alg);
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
ret = mbedtls_ecdsa_read_signature( (mbedtls_ecdsa_context *) ctx,
|
2014-04-08 12:40:15 +02:00
|
|
|
hash, hash_len, sig, sig_len );
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
if( ret == MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH )
|
|
|
|
return( MBEDTLS_ERR_PK_SIG_LEN_MISMATCH );
|
2014-04-08 12:40:15 +02:00
|
|
|
|
|
|
|
return( ret );
|
2013-08-14 18:16:50 +02:00
|
|
|
}
|
2018-10-31 10:16:46 +01:00
|
|
|
#endif /* MBEDTLS_USE_PSA_CRYPTO */
|
2013-08-14 18:16:50 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
static int ecdsa_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
2013-08-21 10:34:38 +02:00
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
unsigned char *sig, size_t *sig_len,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
return( mbedtls_ecdsa_write_signature( (mbedtls_ecdsa_context *) ctx,
|
2015-03-31 11:41:42 +02:00
|
|
|
md_alg, hash, hash_len, sig, sig_len, f_rng, p_rng ) );
|
2013-08-21 10:34:38 +02:00
|
|
|
}
|
|
|
|
|
2017-05-09 10:42:40 +02:00
|
|
|
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
|
|
|
static int ecdsa_verify_rs_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
const unsigned char *sig, size_t sig_len,
|
|
|
|
void *rs_ctx )
|
|
|
|
{
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2017-05-09 10:42:40 +02:00
|
|
|
((void) md_alg);
|
|
|
|
|
|
|
|
ret = mbedtls_ecdsa_read_signature_restartable(
|
|
|
|
(mbedtls_ecdsa_context *) ctx,
|
|
|
|
hash, hash_len, sig, sig_len,
|
|
|
|
(mbedtls_ecdsa_restart_ctx *) rs_ctx );
|
|
|
|
|
|
|
|
if( ret == MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH )
|
|
|
|
return( MBEDTLS_ERR_PK_SIG_LEN_MISMATCH );
|
|
|
|
|
|
|
|
return( ret );
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ecdsa_sign_rs_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
unsigned char *sig, size_t *sig_len,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
|
|
|
|
void *rs_ctx )
|
|
|
|
{
|
|
|
|
return( mbedtls_ecdsa_write_signature_restartable(
|
|
|
|
(mbedtls_ecdsa_context *) ctx,
|
|
|
|
md_alg, hash, hash_len, sig, sig_len, f_rng, p_rng,
|
|
|
|
(mbedtls_ecdsa_restart_ctx *) rs_ctx ) );
|
|
|
|
|
|
|
|
}
|
|
|
|
#endif /* MBEDTLS_ECP_RESTARTABLE */
|
|
|
|
|
2013-08-14 18:16:50 +02:00
|
|
|
static void *ecdsa_alloc_wrap( void )
|
|
|
|
{
|
2015-05-26 16:04:06 +02:00
|
|
|
void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_ecdsa_context ) );
|
2013-08-14 18:16:50 +02:00
|
|
|
|
|
|
|
if( ctx != NULL )
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_ecdsa_init( (mbedtls_ecdsa_context *) ctx );
|
2013-08-14 18:16:50 +02:00
|
|
|
|
|
|
|
return( ctx );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ecdsa_free_wrap( void *ctx )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_ecdsa_free( (mbedtls_ecdsa_context *) ctx );
|
|
|
|
mbedtls_free( ctx );
|
2013-08-14 18:16:50 +02:00
|
|
|
}
|
|
|
|
|
2017-08-18 17:04:07 +02:00
|
|
|
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
|
|
|
static void *ecdsa_rs_alloc( void )
|
|
|
|
{
|
|
|
|
void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_ecdsa_restart_ctx ) );
|
|
|
|
|
|
|
|
if( ctx != NULL )
|
|
|
|
mbedtls_ecdsa_restart_init( ctx );
|
|
|
|
|
|
|
|
return( ctx );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ecdsa_rs_free( void *ctx )
|
|
|
|
{
|
|
|
|
mbedtls_ecdsa_restart_free( ctx );
|
|
|
|
mbedtls_free( ctx );
|
|
|
|
}
|
|
|
|
#endif /* MBEDTLS_ECP_RESTARTABLE */
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
const mbedtls_pk_info_t mbedtls_ecdsa_info = {
|
|
|
|
MBEDTLS_PK_ECDSA,
|
2013-08-14 18:16:50 +02:00
|
|
|
"ECDSA",
|
2015-06-18 16:06:55 +02:00
|
|
|
eckey_get_bitlen, /* Compatible key structures */
|
2013-08-14 18:16:50 +02:00
|
|
|
ecdsa_can_do,
|
|
|
|
ecdsa_verify_wrap,
|
2013-08-21 10:34:38 +02:00
|
|
|
ecdsa_sign_wrap,
|
2017-05-09 10:42:40 +02:00
|
|
|
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
|
|
|
ecdsa_verify_rs_wrap,
|
|
|
|
ecdsa_sign_rs_wrap,
|
|
|
|
#endif
|
2013-08-21 11:51:08 +02:00
|
|
|
NULL,
|
|
|
|
NULL,
|
2014-11-06 16:51:20 +01:00
|
|
|
eckey_check_pair, /* Compatible key structures */
|
2013-08-14 18:16:50 +02:00
|
|
|
ecdsa_alloc_wrap,
|
|
|
|
ecdsa_free_wrap,
|
2017-08-18 16:22:06 +02:00
|
|
|
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
2017-08-18 17:04:07 +02:00
|
|
|
ecdsa_rs_alloc,
|
|
|
|
ecdsa_rs_free,
|
2017-08-18 16:22:06 +02:00
|
|
|
#endif
|
2013-08-14 18:16:50 +02:00
|
|
|
eckey_debug, /* Compatible key structures */
|
|
|
|
};
|
2015-04-08 12:49:31 +02:00
|
|
|
#endif /* MBEDTLS_ECDSA_C */
|
2013-08-21 12:28:31 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
|
2013-08-21 12:28:31 +02:00
|
|
|
/*
|
|
|
|
* Support for alternative RSA-private implementations
|
|
|
|
*/
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
static int rsa_alt_can_do( mbedtls_pk_type_t type )
|
2014-06-05 13:41:44 +02:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
return( type == MBEDTLS_PK_RSA );
|
2014-06-05 13:41:44 +02:00
|
|
|
}
|
|
|
|
|
2015-06-18 16:06:55 +02:00
|
|
|
static size_t rsa_alt_get_bitlen( const void *ctx )
|
2013-08-21 12:28:31 +02:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
const mbedtls_rsa_alt_context *rsa_alt = (const mbedtls_rsa_alt_context *) ctx;
|
2013-08-21 12:28:31 +02:00
|
|
|
|
2014-04-03 22:09:18 +02:00
|
|
|
return( 8 * rsa_alt->key_len_func( rsa_alt->key ) );
|
2013-08-21 12:28:31 +02:00
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
static int rsa_alt_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
2013-08-21 12:28:31 +02:00
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
unsigned char *sig, size_t *sig_len,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_rsa_alt_context *rsa_alt = (mbedtls_rsa_alt_context *) ctx;
|
2013-08-21 12:28:31 +02:00
|
|
|
|
2017-08-04 14:32:15 +02:00
|
|
|
#if SIZE_MAX > UINT_MAX
|
2017-01-19 12:24:33 +01:00
|
|
|
if( UINT_MAX < hash_len )
|
|
|
|
return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
|
2017-08-04 14:32:15 +02:00
|
|
|
#endif /* SIZE_MAX > UINT_MAX */
|
2017-01-19 12:24:33 +01:00
|
|
|
|
2013-08-21 12:28:31 +02:00
|
|
|
*sig_len = rsa_alt->key_len_func( rsa_alt->key );
|
2019-11-05 17:31:36 +01:00
|
|
|
if( *sig_len > MBEDTLS_PK_SIGNATURE_MAX_SIZE )
|
|
|
|
return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
|
2013-08-21 12:28:31 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
return( rsa_alt->sign_func( rsa_alt->key, f_rng, p_rng, MBEDTLS_RSA_PRIVATE,
|
2013-10-11 18:58:55 +02:00
|
|
|
md_alg, (unsigned int) hash_len, hash, sig ) );
|
2013-08-21 12:28:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int rsa_alt_decrypt_wrap( void *ctx,
|
|
|
|
const unsigned char *input, size_t ilen,
|
|
|
|
unsigned char *output, size_t *olen, size_t osize,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_rsa_alt_context *rsa_alt = (mbedtls_rsa_alt_context *) ctx;
|
2013-08-21 12:28:31 +02:00
|
|
|
|
|
|
|
((void) f_rng);
|
|
|
|
((void) p_rng);
|
|
|
|
|
|
|
|
if( ilen != rsa_alt->key_len_func( rsa_alt->key ) )
|
2015-04-08 12:49:31 +02:00
|
|
|
return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
|
2013-08-21 12:28:31 +02:00
|
|
|
|
|
|
|
return( rsa_alt->decrypt_func( rsa_alt->key,
|
2015-04-08 12:49:31 +02:00
|
|
|
MBEDTLS_RSA_PRIVATE, olen, input, output, osize ) );
|
2013-08-21 12:28:31 +02:00
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_RSA_C)
|
2014-11-08 17:08:08 +01:00
|
|
|
static int rsa_alt_check_pair( const void *pub, const void *prv )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
unsigned char sig[MBEDTLS_MPI_MAX_SIZE];
|
2014-11-08 17:08:08 +01:00
|
|
|
unsigned char hash[32];
|
|
|
|
size_t sig_len = 0;
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2014-11-08 17:08:08 +01:00
|
|
|
|
2015-06-18 16:06:55 +02:00
|
|
|
if( rsa_alt_get_bitlen( prv ) != rsa_get_bitlen( pub ) )
|
2015-04-08 12:49:31 +02:00
|
|
|
return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
|
2014-11-08 17:08:08 +01:00
|
|
|
|
|
|
|
memset( hash, 0x2a, sizeof( hash ) );
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
if( ( ret = rsa_alt_sign_wrap( (void *) prv, MBEDTLS_MD_NONE,
|
2014-11-08 17:08:08 +01:00
|
|
|
hash, sizeof( hash ),
|
|
|
|
sig, &sig_len, NULL, NULL ) ) != 0 )
|
|
|
|
{
|
|
|
|
return( ret );
|
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
if( rsa_verify_wrap( (void *) pub, MBEDTLS_MD_NONE,
|
2014-11-08 17:08:08 +01:00
|
|
|
hash, sizeof( hash ), sig, sig_len ) != 0 )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
|
2014-11-08 17:08:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return( 0 );
|
|
|
|
}
|
2015-04-08 12:49:31 +02:00
|
|
|
#endif /* MBEDTLS_RSA_C */
|
2014-11-08 17:08:08 +01:00
|
|
|
|
2013-08-21 12:28:31 +02:00
|
|
|
static void *rsa_alt_alloc_wrap( void )
|
|
|
|
{
|
2015-05-26 16:04:06 +02:00
|
|
|
void *ctx = mbedtls_calloc( 1, sizeof( mbedtls_rsa_alt_context ) );
|
2013-08-21 12:28:31 +02:00
|
|
|
|
|
|
|
if( ctx != NULL )
|
2015-04-08 12:49:31 +02:00
|
|
|
memset( ctx, 0, sizeof( mbedtls_rsa_alt_context ) );
|
2013-08-21 12:28:31 +02:00
|
|
|
|
2014-06-17 14:06:49 +02:00
|
|
|
return( ctx );
|
2013-08-21 12:28:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void rsa_alt_free_wrap( void *ctx )
|
|
|
|
{
|
2018-04-17 16:51:09 +02:00
|
|
|
mbedtls_platform_zeroize( ctx, sizeof( mbedtls_rsa_alt_context ) );
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_free( ctx );
|
2013-08-21 12:28:31 +02:00
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
const mbedtls_pk_info_t mbedtls_rsa_alt_info = {
|
|
|
|
MBEDTLS_PK_RSA_ALT,
|
2013-08-21 12:28:31 +02:00
|
|
|
"RSA-alt",
|
2015-06-18 16:06:55 +02:00
|
|
|
rsa_alt_get_bitlen,
|
2014-06-05 13:41:44 +02:00
|
|
|
rsa_alt_can_do,
|
2013-08-21 12:28:31 +02:00
|
|
|
NULL,
|
|
|
|
rsa_alt_sign_wrap,
|
2017-08-18 17:30:37 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
|
2017-05-09 10:42:40 +02:00
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
#endif
|
2013-08-21 12:28:31 +02:00
|
|
|
rsa_alt_decrypt_wrap,
|
|
|
|
NULL,
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_RSA_C)
|
2014-11-08 17:08:08 +01:00
|
|
|
rsa_alt_check_pair,
|
2014-11-12 00:01:34 +01:00
|
|
|
#else
|
|
|
|
NULL,
|
|
|
|
#endif
|
2013-08-21 12:28:31 +02:00
|
|
|
rsa_alt_alloc_wrap,
|
|
|
|
rsa_alt_free_wrap,
|
2017-08-18 17:30:37 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
|
2017-08-18 16:22:06 +02:00
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
#endif
|
2013-08-21 12:28:31 +02:00
|
|
|
NULL,
|
|
|
|
};
|
2013-08-22 13:29:31 +02:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */
|
2015-03-31 14:01:33 +02:00
|
|
|
|
2018-10-22 12:11:15 +02:00
|
|
|
#if defined(MBEDTLS_USE_PSA_CRYPTO)
|
|
|
|
|
2018-11-06 09:34:30 +01:00
|
|
|
static void *pk_opaque_alloc_wrap( void )
|
2018-10-31 09:57:45 +01:00
|
|
|
{
|
2019-01-08 15:36:01 +01:00
|
|
|
void *ctx = mbedtls_calloc( 1, sizeof( psa_key_handle_t ) );
|
2018-10-31 09:57:45 +01:00
|
|
|
|
|
|
|
/* no _init() function to call, an calloc() already zeroized */
|
|
|
|
|
|
|
|
return( ctx );
|
|
|
|
}
|
|
|
|
|
2018-11-06 09:34:30 +01:00
|
|
|
static void pk_opaque_free_wrap( void *ctx )
|
2018-10-31 09:57:45 +01:00
|
|
|
{
|
2019-01-08 15:36:01 +01:00
|
|
|
mbedtls_platform_zeroize( ctx, sizeof( psa_key_handle_t ) );
|
2018-10-31 09:57:45 +01:00
|
|
|
mbedtls_free( ctx );
|
|
|
|
}
|
|
|
|
|
2018-11-06 09:34:30 +01:00
|
|
|
static size_t pk_opaque_get_bitlen( const void *ctx )
|
2018-10-31 10:36:51 +01:00
|
|
|
{
|
2019-01-08 15:36:01 +01:00
|
|
|
const psa_key_handle_t *key = (const psa_key_handle_t *) ctx;
|
2018-10-31 10:36:51 +01:00
|
|
|
size_t bits;
|
2019-05-27 14:53:13 +02:00
|
|
|
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
|
2018-10-31 10:36:51 +01:00
|
|
|
|
2019-05-27 14:53:13 +02:00
|
|
|
if( PSA_SUCCESS != psa_get_key_attributes( *key, &attributes ) )
|
2018-10-31 10:36:51 +01:00
|
|
|
return( 0 );
|
|
|
|
|
2019-05-27 14:53:13 +02:00
|
|
|
bits = psa_get_key_bits( &attributes );
|
|
|
|
psa_reset_key_attributes( &attributes );
|
2018-10-31 10:36:51 +01:00
|
|
|
return( bits );
|
|
|
|
}
|
|
|
|
|
2018-11-06 09:34:30 +01:00
|
|
|
static int pk_opaque_can_do( mbedtls_pk_type_t type )
|
2018-10-31 10:57:29 +01:00
|
|
|
{
|
|
|
|
/* For now opaque PSA keys can only wrap ECC keypairs,
|
|
|
|
* as checked by setup_psa().
|
|
|
|
* Also, ECKEY_DH does not really make sense with the current API. */
|
|
|
|
return( type == MBEDTLS_PK_ECKEY ||
|
|
|
|
type == MBEDTLS_PK_ECDSA );
|
|
|
|
}
|
|
|
|
|
2018-11-13 10:32:00 +01:00
|
|
|
/*
|
2018-11-15 12:17:38 +01:00
|
|
|
* Simultaneously convert and move raw MPI from the beginning of a buffer
|
|
|
|
* to an ASN.1 MPI at the end of the buffer.
|
|
|
|
* See also mbedtls_asn1_write_mpi().
|
2018-11-13 10:32:00 +01:00
|
|
|
*
|
|
|
|
* p: pointer to the end of the output buffer
|
|
|
|
* start: start of the output buffer, and also of the mpi to write at the end
|
2018-11-15 12:17:38 +01:00
|
|
|
* n_len: length of the mpi to read from start
|
2018-11-13 10:32:00 +01:00
|
|
|
*/
|
2018-10-31 16:22:49 +01:00
|
|
|
static int asn1_write_mpibuf( unsigned char **p, unsigned char *start,
|
2018-11-13 10:32:00 +01:00
|
|
|
size_t n_len )
|
2018-10-31 16:22:49 +01:00
|
|
|
{
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2018-10-31 16:22:49 +01:00
|
|
|
size_t len = 0;
|
|
|
|
|
2018-11-13 10:32:00 +01:00
|
|
|
if( (size_t)( *p - start ) < n_len )
|
2018-10-31 16:22:49 +01:00
|
|
|
return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
|
|
|
|
|
2018-11-13 10:32:00 +01:00
|
|
|
len = n_len;
|
2018-10-31 16:22:49 +01:00
|
|
|
*p -= len;
|
2018-11-13 10:32:00 +01:00
|
|
|
memmove( *p, start, len );
|
2018-10-31 16:22:49 +01:00
|
|
|
|
2018-11-16 10:09:11 +01:00
|
|
|
/* ASN.1 DER encoding requires minimal length, so skip leading 0s.
|
2018-11-16 10:54:54 +01:00
|
|
|
* Neither r nor s should be 0, but as a failsafe measure, still detect
|
|
|
|
* that rather than overflowing the buffer in case of a PSA error. */
|
|
|
|
while( len > 0 && **p == 0x00 )
|
2018-11-16 10:09:11 +01:00
|
|
|
{
|
|
|
|
++(*p);
|
|
|
|
--len;
|
|
|
|
}
|
|
|
|
|
2018-11-16 10:54:54 +01:00
|
|
|
/* this is only reached if the signature was invalid */
|
|
|
|
if( len == 0 )
|
|
|
|
return( MBEDTLS_ERR_PK_HW_ACCEL_FAILED );
|
|
|
|
|
2018-11-13 10:32:00 +01:00
|
|
|
/* if the msb is 1, ASN.1 requires that we prepend a 0.
|
2018-11-16 10:09:11 +01:00
|
|
|
* Neither r nor s can be 0, so we can assume len > 0 at all times. */
|
2018-10-31 16:22:49 +01:00
|
|
|
if( **p & 0x80 )
|
|
|
|
{
|
|
|
|
if( *p - start < 1 )
|
|
|
|
return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL );
|
|
|
|
|
|
|
|
*--(*p) = 0x00;
|
|
|
|
len += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) );
|
2018-11-13 10:32:00 +01:00
|
|
|
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start,
|
|
|
|
MBEDTLS_ASN1_INTEGER ) );
|
2018-10-31 16:22:49 +01:00
|
|
|
|
|
|
|
return( (int) len );
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Transcode signature from PSA format to ASN.1 sequence.
|
2018-11-13 10:32:00 +01:00
|
|
|
* See ecdsa_signature_to_asn1 in ecdsa.c, but with byte buffers instead of
|
|
|
|
* MPIs, and in-place.
|
2018-10-31 16:22:49 +01:00
|
|
|
*
|
2018-11-13 10:32:00 +01:00
|
|
|
* [in/out] sig: the signature pre- and post-transcoding
|
2018-10-31 16:22:49 +01:00
|
|
|
* [in/out] sig_len: signature length pre- and post-transcoding
|
2018-11-13 10:32:00 +01:00
|
|
|
* [int] buf_len: the available size the in/out buffer
|
2018-10-31 16:22:49 +01:00
|
|
|
*/
|
2018-11-13 10:32:00 +01:00
|
|
|
static int pk_ecdsa_sig_asn1_from_psa( unsigned char *sig, size_t *sig_len,
|
|
|
|
size_t buf_len )
|
2018-10-31 16:22:49 +01:00
|
|
|
{
|
2019-11-22 14:21:35 +01:00
|
|
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
2018-10-31 16:22:49 +01:00
|
|
|
size_t len = 0;
|
2018-11-13 10:32:00 +01:00
|
|
|
const size_t rs_len = *sig_len / 2;
|
|
|
|
unsigned char *p = sig + buf_len;
|
2018-10-31 16:22:49 +01:00
|
|
|
|
2018-11-13 10:32:00 +01:00
|
|
|
MBEDTLS_ASN1_CHK_ADD( len, asn1_write_mpibuf( &p, sig + rs_len, rs_len ) );
|
|
|
|
MBEDTLS_ASN1_CHK_ADD( len, asn1_write_mpibuf( &p, sig, rs_len ) );
|
2018-10-31 16:22:49 +01:00
|
|
|
|
2018-11-13 10:32:00 +01:00
|
|
|
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( &p, sig, len ) );
|
|
|
|
MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( &p, sig,
|
|
|
|
MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) );
|
2018-10-31 16:22:49 +01:00
|
|
|
|
2018-11-13 10:32:00 +01:00
|
|
|
memmove( sig, p, len );
|
2018-10-31 16:22:49 +01:00
|
|
|
*sig_len = len;
|
|
|
|
|
|
|
|
return( 0 );
|
|
|
|
}
|
|
|
|
|
2018-11-06 09:34:30 +01:00
|
|
|
static int pk_opaque_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
|
2018-10-31 16:22:49 +01:00
|
|
|
const unsigned char *hash, size_t hash_len,
|
|
|
|
unsigned char *sig, size_t *sig_len,
|
|
|
|
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
|
|
|
|
{
|
2019-01-08 15:36:01 +01:00
|
|
|
const psa_key_handle_t *key = (const psa_key_handle_t *) ctx;
|
2019-05-27 14:53:13 +02:00
|
|
|
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
|
2018-10-31 16:22:49 +01:00
|
|
|
psa_algorithm_t alg = PSA_ALG_ECDSA( mbedtls_psa_translate_md( md_alg ) );
|
2019-05-27 14:53:13 +02:00
|
|
|
size_t buf_len;
|
2018-11-13 10:32:00 +01:00
|
|
|
psa_status_t status;
|
2018-10-31 16:22:49 +01:00
|
|
|
|
|
|
|
/* PSA has its own RNG */
|
|
|
|
(void) f_rng;
|
|
|
|
(void) p_rng;
|
|
|
|
|
2018-11-13 10:32:00 +01:00
|
|
|
/* PSA needs an output buffer of known size, but our API doesn't provide
|
|
|
|
* that information. Assume that the buffer is large enough for a
|
|
|
|
* maximal-length signature with that key (otherwise the application is
|
|
|
|
* buggy anyway). */
|
2019-05-27 14:53:13 +02:00
|
|
|
status = psa_get_key_attributes( *key, &attributes );
|
2018-11-13 10:32:00 +01:00
|
|
|
if( status != PSA_SUCCESS )
|
2018-11-16 10:15:09 +01:00
|
|
|
return( mbedtls_psa_err_translate_pk( status ) );
|
2019-05-27 14:53:13 +02:00
|
|
|
buf_len = MBEDTLS_ECDSA_MAX_SIG_LEN( psa_get_key_bits( &attributes ) );
|
|
|
|
psa_reset_key_attributes( &attributes );
|
2019-11-08 17:33:29 +01:00
|
|
|
if( buf_len > MBEDTLS_PK_SIGNATURE_MAX_SIZE )
|
2019-11-05 17:31:36 +01:00
|
|
|
return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
|
2018-10-31 16:22:49 +01:00
|
|
|
|
2018-11-13 10:32:00 +01:00
|
|
|
/* make the signature */
|
2019-11-26 17:01:59 +01:00
|
|
|
status = psa_sign_hash( *key, alg, hash, hash_len,
|
|
|
|
sig, buf_len, sig_len );
|
2018-11-13 10:32:00 +01:00
|
|
|
if( status != PSA_SUCCESS )
|
2018-11-16 10:15:09 +01:00
|
|
|
return( mbedtls_psa_err_translate_pk( status ) );
|
2018-10-31 16:22:49 +01:00
|
|
|
|
2018-11-13 10:32:00 +01:00
|
|
|
/* transcode it to ASN.1 sequence */
|
|
|
|
return( pk_ecdsa_sig_asn1_from_psa( sig, sig_len, buf_len ) );
|
2018-10-31 16:22:49 +01:00
|
|
|
}
|
|
|
|
|
2018-11-06 09:34:30 +01:00
|
|
|
const mbedtls_pk_info_t mbedtls_pk_opaque_info = {
|
|
|
|
MBEDTLS_PK_OPAQUE,
|
|
|
|
"Opaque",
|
|
|
|
pk_opaque_get_bitlen,
|
|
|
|
pk_opaque_can_do,
|
2018-10-22 12:11:15 +02:00
|
|
|
NULL, /* verify - will be done later */
|
2018-11-06 09:34:30 +01:00
|
|
|
pk_opaque_sign_wrap,
|
2018-10-22 12:11:15 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
|
|
|
|
NULL, /* restartable verify - not relevant */
|
|
|
|
NULL, /* restartable sign - not relevant */
|
|
|
|
#endif
|
|
|
|
NULL, /* decrypt - will be done later */
|
|
|
|
NULL, /* encrypt - will be done later */
|
|
|
|
NULL, /* check_pair - could be done later or left NULL */
|
2018-11-06 09:34:30 +01:00
|
|
|
pk_opaque_alloc_wrap,
|
|
|
|
pk_opaque_free_wrap,
|
2018-10-22 12:11:15 +02:00
|
|
|
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
|
|
|
|
NULL, /* restart alloc - not relevant */
|
|
|
|
NULL, /* restart free - not relevant */
|
|
|
|
#endif
|
|
|
|
NULL, /* debug - could be done later, or even left NULL */
|
|
|
|
};
|
|
|
|
|
|
|
|
#endif /* MBEDTLS_USE_PSA_CRYPTO */
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#endif /* MBEDTLS_PK_C */
|