kopia lustrzana https://github.com/espressif/esp-idf
wpa_supplicant: Replace internal RSA APIs by mbedtls APIs
Curretly wpa_supplicant uses internal APIs for RSA operations which internally uses lots of big num operations. Big num operations are CPU expensive and can take a lot of time which can cause watchdog timer to tigger. This can be optimize by using mbedtls APIs which uses hardware blocks for big num operations. To fix this, write new crypto_mbedtls-rsa.c which has APIs similar to crypto_internal-rsa.c but uses mbedtls APIs.pull/5452/head
kapil.gupta
bot
rodzic
8526cb577c
commit
1cabd06f0c
|
|
@ -27,6 +27,7 @@ set(srcs "port/os_xtensa.c"
|
|||
"src/crypto/crypto_internal-cipher.c"
|
||||
"src/crypto/crypto_internal-modexp.c"
|
||||
"src/crypto/crypto_internal-rsa.c"
|
||||
"src/crypto/crypto_mbedtls-rsa.c"
|
||||
"src/crypto/crypto_internal.c"
|
||||
"src/crypto/des-internal.c"
|
||||
"src/crypto/dh_group5.c"
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
#include "tls/pkcs1.h"
|
||||
#include "tls/pkcs8.h"
|
||||
|
||||
#ifndef USE_MBEDTLS_CRYPTO
|
||||
/* Dummy structures; these are just typecast to struct crypto_rsa_key */
|
||||
struct crypto_public_key;
|
||||
struct crypto_private_key;
|
||||
|
|
@ -28,7 +29,6 @@ struct crypto_public_key * crypto_public_key_import(const u8 *key, size_t len)
|
|||
crypto_rsa_import_public_key(key, len);
|
||||
}
|
||||
|
||||
|
||||
struct crypto_private_key * crypto_private_key_import(const u8 *key,
|
||||
size_t len,
|
||||
const char *passwd)
|
||||
|
|
@ -109,3 +109,4 @@ int crypto_public_key_decrypt_pkcs1(struct crypto_public_key *key,
|
|||
return pkcs1_decrypt_public_key((struct crypto_rsa_key *) key,
|
||||
crypt, crypt_len, plain, plain_len);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,356 @@
|
|||
/*
|
||||
* Copyright (C) Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD, Apache 2.0 License.
|
||||
*
|
||||
*
|
||||
* 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
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifdef ESP_PLATFORM
|
||||
#include "mbedtls/bignum.h"
|
||||
#endif
|
||||
|
||||
#include "utils/includes.h"
|
||||
#include "utils/common.h"
|
||||
#include "crypto.h"
|
||||
#include "common/defs.h"
|
||||
|
||||
#ifdef USE_MBEDTLS_CRYPTO
|
||||
#include "mbedtls/entropy.h"
|
||||
#include "mbedtls/ctr_drbg.h"
|
||||
|
||||
#include <mbedtls/error.h>
|
||||
#include <mbedtls/x509_crt.h>
|
||||
#include <mbedtls/platform.h>
|
||||
#include <mbedtls/sha256.h>
|
||||
|
||||
/* Dummy structures; these are just typecast to struct crypto_rsa_key */
|
||||
struct crypto_public_key;
|
||||
struct crypto_private_key;
|
||||
|
||||
static void crypto_dump_verify_info(u32 flags)
|
||||
{
|
||||
char dump_buffer[1024];
|
||||
|
||||
mbedtls_x509_crt_verify_info(dump_buffer, 1024, " ! ", flags );
|
||||
wpa_printf(MSG_ERROR, "%s", dump_buffer);
|
||||
}
|
||||
|
||||
int crypto_verify_cert(const u8 *cert_start, int certlen, const u8 *ca_cert_start, int ca_certlen)
|
||||
{
|
||||
int ret;
|
||||
u32 flags = 0;
|
||||
|
||||
mbedtls_x509_crt *cert = os_zalloc(sizeof(mbedtls_x509_crt));
|
||||
mbedtls_x509_crt *ca_cert = os_zalloc(sizeof(mbedtls_x509_crt));
|
||||
|
||||
if (!cert || !ca_cert) {
|
||||
if (cert)
|
||||
os_free(cert);
|
||||
if (ca_cert)
|
||||
os_free(ca_cert);
|
||||
wpa_printf(MSG_ERROR, "%s: memory allocation failed", __func__);
|
||||
return -1;
|
||||
}
|
||||
mbedtls_x509_crt_init(cert);
|
||||
mbedtls_x509_crt_init(ca_cert);
|
||||
ret = mbedtls_x509_crt_parse(cert, cert_start, certlen);
|
||||
if (ret < 0) {
|
||||
wpa_printf(MSG_ERROR, "peer cert parsing failed");
|
||||
goto cleanup;
|
||||
}
|
||||
ret = mbedtls_x509_crt_parse(ca_cert, ca_cert_start, ca_certlen);
|
||||
if (ret < 0) {
|
||||
wpa_printf(MSG_ERROR, "CA cert parsing failed");
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
ret = mbedtls_x509_crt_verify(cert, ca_cert, NULL, NULL, &flags, NULL, NULL );
|
||||
|
||||
/* Certification is failed, try to get some more info */
|
||||
if (ret != 0)
|
||||
crypto_dump_verify_info(flags);
|
||||
|
||||
cleanup:
|
||||
mbedtls_x509_crt_free(cert);
|
||||
mbedtls_x509_crt_free(ca_cert);
|
||||
|
||||
os_free(cert);
|
||||
os_free(ca_cert);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct crypto_public_key * crypto_public_key_import(const u8 *key, size_t len)
|
||||
{
|
||||
int ret;
|
||||
mbedtls_pk_context *pkey = os_zalloc(sizeof(*pkey));
|
||||
|
||||
if (!pkey)
|
||||
return NULL;
|
||||
|
||||
mbedtls_pk_init(pkey);
|
||||
ret = mbedtls_pk_parse_public_key(pkey, key, len);
|
||||
|
||||
if (ret < 0) {
|
||||
wpa_printf(MSG_ERROR, "failed to parse public key");
|
||||
os_free(pkey);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return (struct crypto_public_key *)pkey;
|
||||
}
|
||||
|
||||
struct crypto_private_key * crypto_private_key_import(const u8 *key,
|
||||
size_t len,
|
||||
const char *passwd)
|
||||
{
|
||||
int ret;
|
||||
mbedtls_pk_context *pkey = os_zalloc(sizeof(mbedtls_pk_context));
|
||||
if (!pkey)
|
||||
return NULL;
|
||||
|
||||
mbedtls_pk_init(pkey);
|
||||
|
||||
ret = mbedtls_pk_parse_key(pkey, key, len, (const unsigned char *)passwd, passwd ? os_strlen(passwd) : 0);
|
||||
|
||||
if (ret < 0) {
|
||||
wpa_printf(MSG_ERROR, "failed to parse private key");
|
||||
os_free(pkey);
|
||||
pkey = NULL;
|
||||
}
|
||||
|
||||
return (struct crypto_private_key *)pkey;
|
||||
}
|
||||
|
||||
struct crypto_public_key *crypto_public_key_from_cert(const u8 *buf,
|
||||
size_t len)
|
||||
{
|
||||
int ret;
|
||||
mbedtls_x509_crt *cert;
|
||||
mbedtls_pk_context *kctx = os_zalloc(sizeof(*kctx));
|
||||
|
||||
if (!kctx) {
|
||||
wpa_printf(MSG_ERROR, "failed to allocate memory");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
cert = os_zalloc(sizeof(mbedtls_x509_crt));
|
||||
if (!cert) {
|
||||
wpa_printf(MSG_ERROR, "failed to allocate memory");
|
||||
goto fail;
|
||||
}
|
||||
mbedtls_x509_crt_init(cert);
|
||||
|
||||
ret = mbedtls_x509_crt_parse(cert, buf, len);
|
||||
if (ret < 0) {
|
||||
wpa_printf(MSG_ERROR, "cert parsing failed");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
mbedtls_pk_init(kctx);
|
||||
|
||||
if(mbedtls_pk_setup(kctx, mbedtls_pk_info_from_type(mbedtls_pk_get_type(&cert->pk))) != 0) {
|
||||
wpa_printf(MSG_ERROR, "key setup failed");
|
||||
goto fail;
|
||||
}
|
||||
ret = mbedtls_rsa_copy(mbedtls_pk_rsa(*kctx), mbedtls_pk_rsa(cert->pk));
|
||||
|
||||
if (ret < 0) {
|
||||
wpa_printf(MSG_ERROR, "key copy failed");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
cleanup:
|
||||
mbedtls_x509_crt_free(cert);
|
||||
os_free(cert);
|
||||
return (struct crypto_public_key *)kctx;
|
||||
fail:
|
||||
os_free(kctx);
|
||||
kctx = NULL;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
int crypto_public_key_encrypt_pkcs1_v15(struct crypto_public_key *key,
|
||||
const u8 *in, size_t inlen,
|
||||
u8 *out, size_t *outlen)
|
||||
{
|
||||
int ret;
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
const char *pers = "rsa_encrypt";
|
||||
mbedtls_entropy_context *entropy = os_zalloc(sizeof(*entropy));
|
||||
mbedtls_ctr_drbg_context *ctr_drbg = os_zalloc(sizeof(*ctr_drbg));
|
||||
|
||||
if (!pkey || !entropy || !ctr_drbg) {
|
||||
if (entropy)
|
||||
os_free(entropy);
|
||||
if (ctr_drbg)
|
||||
os_free(ctr_drbg);
|
||||
wpa_printf(MSG_ERROR, "failed to allocate memory");
|
||||
return -1;
|
||||
}
|
||||
|
||||
mbedtls_entropy_init( entropy );
|
||||
mbedtls_ctr_drbg_init( ctr_drbg );
|
||||
|
||||
ret = mbedtls_ctr_drbg_seed( ctr_drbg, mbedtls_entropy_func,
|
||||
entropy, (const unsigned char *) pers,
|
||||
strlen( pers ) );
|
||||
if( ret != 0 ) {
|
||||
wpa_printf(MSG_ERROR, " failed ! mbedtls_ctr_drbg_seed returned %d",
|
||||
ret );
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
ret = mbedtls_rsa_pkcs1_encrypt(mbedtls_pk_rsa(*pkey), mbedtls_ctr_drbg_random,
|
||||
ctr_drbg, MBEDTLS_RSA_PUBLIC, inlen, in, out);
|
||||
|
||||
if(ret != 0) {
|
||||
wpa_printf(MSG_ERROR, " failed ! mbedtls_rsa_pkcs1_encrypt returned -0x%04x", -ret);
|
||||
goto cleanup;
|
||||
}
|
||||
*outlen = mbedtls_pk_rsa(*pkey)->len;
|
||||
|
||||
cleanup:
|
||||
mbedtls_ctr_drbg_free( ctr_drbg );
|
||||
mbedtls_entropy_free( entropy );
|
||||
os_free(entropy);
|
||||
os_free(ctr_drbg);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int crypto_private_key_decrypt_pkcs1_v15(struct crypto_private_key *key,
|
||||
const u8 *in, size_t inlen,
|
||||
u8 *out, size_t *outlen)
|
||||
{
|
||||
int ret;
|
||||
size_t i;
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
const char *pers = "rsa_decrypt";
|
||||
mbedtls_entropy_context *entropy = os_malloc(sizeof(*entropy));
|
||||
mbedtls_ctr_drbg_context *ctr_drbg = os_malloc(sizeof(*ctr_drbg));
|
||||
|
||||
if (!pkey || !entropy || !ctr_drbg) {
|
||||
if (entropy)
|
||||
os_free(entropy);
|
||||
if (ctr_drbg)
|
||||
os_free(ctr_drbg);
|
||||
return -1;
|
||||
}
|
||||
mbedtls_ctr_drbg_init( ctr_drbg );
|
||||
mbedtls_entropy_init( entropy );
|
||||
ret = mbedtls_ctr_drbg_seed(ctr_drbg, mbedtls_entropy_func,
|
||||
entropy, (const unsigned char *) pers,
|
||||
strlen(pers));
|
||||
|
||||
if (ret < 0)
|
||||
goto cleanup;
|
||||
|
||||
i = mbedtls_pk_rsa(*pkey)->len;
|
||||
ret = mbedtls_rsa_rsaes_pkcs1_v15_decrypt(mbedtls_pk_rsa(*pkey), mbedtls_ctr_drbg_random,
|
||||
ctr_drbg, MBEDTLS_RSA_PRIVATE, &i, in, out, *outlen);
|
||||
|
||||
*outlen = i;
|
||||
|
||||
cleanup:
|
||||
mbedtls_ctr_drbg_free( ctr_drbg );
|
||||
mbedtls_entropy_free( entropy );
|
||||
os_free(entropy);
|
||||
os_free(ctr_drbg);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int crypto_private_key_sign_pkcs1(struct crypto_private_key *key,
|
||||
const u8 *in, size_t inlen,
|
||||
u8 *out, size_t *outlen)
|
||||
{
|
||||
int ret;
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
|
||||
if((ret = mbedtls_rsa_pkcs1_sign(mbedtls_pk_rsa(*pkey), NULL, NULL, MBEDTLS_RSA_PRIVATE,
|
||||
(mbedtls_pk_rsa(*pkey))->hash_id,
|
||||
inlen, in, out)) != 0 ) {
|
||||
wpa_printf(MSG_ERROR, " failed ! mbedtls_rsa_pkcs1_sign returned %d", ret );
|
||||
return -1;
|
||||
}
|
||||
*outlen = mbedtls_pk_rsa(*pkey)->len;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
void crypto_public_key_free(struct crypto_public_key *key)
|
||||
{
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
if (!pkey)
|
||||
return;
|
||||
|
||||
mbedtls_pk_free(pkey);
|
||||
os_free(pkey);
|
||||
}
|
||||
|
||||
|
||||
void crypto_private_key_free(struct crypto_private_key *key)
|
||||
{
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
if (!pkey)
|
||||
return;
|
||||
|
||||
mbedtls_pk_free(pkey);
|
||||
os_free(pkey);
|
||||
}
|
||||
|
||||
|
||||
int crypto_public_key_decrypt_pkcs1(struct crypto_public_key *key,
|
||||
const u8 *crypt, size_t crypt_len,
|
||||
u8 *plain, size_t *plain_len)
|
||||
{
|
||||
const char *pers = "rsa_decrypt";
|
||||
mbedtls_pk_context *pkey = (mbedtls_pk_context *)key;
|
||||
mbedtls_ctr_drbg_context ctr_drbg;
|
||||
mbedtls_entropy_context entropy;
|
||||
size_t i;
|
||||
|
||||
mbedtls_entropy_init( &entropy );
|
||||
mbedtls_ctr_drbg_init( &ctr_drbg );
|
||||
|
||||
int ret = mbedtls_ctr_drbg_seed( &ctr_drbg, mbedtls_entropy_func,
|
||||
&entropy, (const unsigned char *) pers,
|
||||
strlen( pers ) );
|
||||
if(ret != 0) {
|
||||
wpa_printf(MSG_ERROR, " failed ! mbedtls_ctr_drbg_seed returned %d",
|
||||
ret );
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
i = mbedtls_pk_rsa(*pkey)->len;
|
||||
ret = mbedtls_rsa_pkcs1_decrypt(mbedtls_pk_rsa(*pkey), mbedtls_ctr_drbg_random,
|
||||
&ctr_drbg, MBEDTLS_RSA_PUBLIC, &i,
|
||||
crypt, plain, *plain_len);
|
||||
if( ret != 0 ) {
|
||||
wpa_printf(MSG_ERROR, " failed ! mbedtls_rsa_pkcs1_decrypt returned %d",
|
||||
ret );
|
||||
goto cleanup;
|
||||
}
|
||||
*plain_len = i;
|
||||
|
||||
cleanup:
|
||||
mbedtls_entropy_free( &entropy );
|
||||
mbedtls_ctr_drbg_free( &ctr_drbg );
|
||||
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
Ładowanie…
Reference in New Issue