mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 05:43:48 -07:00
changing {} style to match majority of previous style
This commit is contained in:
Philippe Teuwen
parent
da6cdf014b
commit
961d929f4d
320 changed files with 5502 additions and 10485 deletions
|
|
@ -71,8 +71,7 @@
|
|||
* A terminating null byte is always appended. It is included in the announced
|
||||
* length only if the data looks like it is PEM encoded.
|
||||
*/
|
||||
int mbedtls_pk_load_file(const char *path, unsigned char **buf, size_t *n)
|
||||
{
|
||||
int mbedtls_pk_load_file(const char *path, unsigned char **buf, size_t *n) {
|
||||
FILE *f;
|
||||
long size;
|
||||
|
||||
|
|
@ -89,7 +88,7 @@ int mbedtls_pk_load_file(const char *path, unsigned char **buf, size_t *n)
|
|||
*n = (size_t) size;
|
||||
|
||||
if (*n + 1 == 0 ||
|
||||
(*buf = mbedtls_calloc(1, *n + 1)) == NULL) {
|
||||
(*buf = mbedtls_calloc(1, *n + 1)) == NULL) {
|
||||
fclose(f);
|
||||
return (MBEDTLS_ERR_PK_ALLOC_FAILED);
|
||||
}
|
||||
|
|
@ -117,8 +116,7 @@ int mbedtls_pk_load_file(const char *path, unsigned char **buf, size_t *n)
|
|||
* Load and parse a private key
|
||||
*/
|
||||
int mbedtls_pk_parse_keyfile(mbedtls_pk_context *ctx,
|
||||
const char *path, const char *pwd)
|
||||
{
|
||||
const char *path, const char *pwd) {
|
||||
int ret;
|
||||
size_t n;
|
||||
unsigned char *buf;
|
||||
|
|
@ -141,8 +139,7 @@ int mbedtls_pk_parse_keyfile(mbedtls_pk_context *ctx,
|
|||
/*
|
||||
* Load and parse a public key
|
||||
*/
|
||||
int mbedtls_pk_parse_public_keyfile(mbedtls_pk_context *ctx, const char *path)
|
||||
{
|
||||
int mbedtls_pk_parse_public_keyfile(mbedtls_pk_context *ctx, const char *path) {
|
||||
int ret;
|
||||
size_t n;
|
||||
unsigned char *buf;
|
||||
|
|
@ -169,8 +166,7 @@ int mbedtls_pk_parse_public_keyfile(mbedtls_pk_context *ctx, const char *path)
|
|||
* }
|
||||
*/
|
||||
static int pk_get_ecparams(unsigned char **p, const unsigned char *end,
|
||||
mbedtls_asn1_buf *params)
|
||||
{
|
||||
mbedtls_asn1_buf *params) {
|
||||
int ret;
|
||||
|
||||
if (end - *p < 1)
|
||||
|
|
@ -181,7 +177,7 @@ static int pk_get_ecparams(unsigned char **p, const unsigned char *end,
|
|||
params->tag = **p;
|
||||
if (params->tag != MBEDTLS_ASN1_OID
|
||||
#if defined(MBEDTLS_PK_PARSE_EC_EXTENDED)
|
||||
&& params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)
|
||||
&& params->tag != (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)
|
||||
#endif
|
||||
) {
|
||||
return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
|
||||
|
|
@ -222,8 +218,7 @@ static int pk_get_ecparams(unsigned char **p, const unsigned char *end,
|
|||
*
|
||||
* We only support prime-field as field type, and ignore hash and cofactor.
|
||||
*/
|
||||
static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp)
|
||||
{
|
||||
static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp) {
|
||||
int ret;
|
||||
unsigned char *p = params->p;
|
||||
const unsigned char *const end = params->p + params->len;
|
||||
|
|
@ -262,7 +257,7 @@ static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_g
|
|||
return (ret);
|
||||
|
||||
if (len != MBEDTLS_OID_SIZE(MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD) ||
|
||||
memcmp(p, MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD, len) != 0) {
|
||||
memcmp(p, MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD, len) != 0) {
|
||||
return (MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE);
|
||||
}
|
||||
|
||||
|
|
@ -298,14 +293,14 @@ static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_g
|
|||
* containing an integer in the case of a prime field
|
||||
*/
|
||||
if ((ret = mbedtls_asn1_get_tag(&p, end_curve, &len, MBEDTLS_ASN1_OCTET_STRING)) != 0 ||
|
||||
(ret = mbedtls_mpi_read_binary(&grp->A, p, len)) != 0) {
|
||||
(ret = mbedtls_mpi_read_binary(&grp->A, p, len)) != 0) {
|
||||
return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
|
||||
}
|
||||
|
||||
p += len;
|
||||
|
||||
if ((ret = mbedtls_asn1_get_tag(&p, end_curve, &len, MBEDTLS_ASN1_OCTET_STRING)) != 0 ||
|
||||
(ret = mbedtls_mpi_read_binary(&grp->B, p, len)) != 0) {
|
||||
(ret = mbedtls_mpi_read_binary(&grp->B, p, len)) != 0) {
|
||||
return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
|
||||
}
|
||||
|
||||
|
|
@ -332,11 +327,11 @@ static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_g
|
|||
* reading only the X coordinate and the parity bit of Y.
|
||||
*/
|
||||
if (ret != MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE ||
|
||||
(p[0] != 0x02 && p[0] != 0x03) ||
|
||||
len != mbedtls_mpi_size(&grp->P) + 1 ||
|
||||
mbedtls_mpi_read_binary(&grp->G.X, p + 1, len - 1) != 0 ||
|
||||
mbedtls_mpi_lset(&grp->G.Y, p[0] - 2) != 0 ||
|
||||
mbedtls_mpi_lset(&grp->G.Z, 1) != 0) {
|
||||
(p[0] != 0x02 && p[0] != 0x03) ||
|
||||
len != mbedtls_mpi_size(&grp->P) + 1 ||
|
||||
mbedtls_mpi_read_binary(&grp->G.X, p + 1, len - 1) != 0 ||
|
||||
mbedtls_mpi_lset(&grp->G.Y, p[0] - 2) != 0 ||
|
||||
mbedtls_mpi_lset(&grp->G.Z, 1) != 0) {
|
||||
return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT);
|
||||
}
|
||||
}
|
||||
|
|
@ -362,8 +357,7 @@ static int pk_group_from_specified(const mbedtls_asn1_buf *params, mbedtls_ecp_g
|
|||
* Find the group id associated with an (almost filled) group as generated by
|
||||
* pk_group_from_specified(), or return an error if unknown.
|
||||
*/
|
||||
static int pk_group_id_from_group(const mbedtls_ecp_group *grp, mbedtls_ecp_group_id *grp_id)
|
||||
{
|
||||
static int pk_group_id_from_group(const mbedtls_ecp_group *grp, mbedtls_ecp_group_id *grp_id) {
|
||||
int ret = 0;
|
||||
mbedtls_ecp_group ref;
|
||||
const mbedtls_ecp_group_id *id;
|
||||
|
|
@ -377,14 +371,14 @@ static int pk_group_id_from_group(const mbedtls_ecp_group *grp, mbedtls_ecp_grou
|
|||
|
||||
/* Compare to the group we were given, starting with easy tests */
|
||||
if (grp->pbits == ref.pbits && grp->nbits == ref.nbits &&
|
||||
mbedtls_mpi_cmp_mpi(&grp->P, &ref.P) == 0 &&
|
||||
mbedtls_mpi_cmp_mpi(&grp->A, &ref.A) == 0 &&
|
||||
mbedtls_mpi_cmp_mpi(&grp->B, &ref.B) == 0 &&
|
||||
mbedtls_mpi_cmp_mpi(&grp->N, &ref.N) == 0 &&
|
||||
mbedtls_mpi_cmp_mpi(&grp->G.X, &ref.G.X) == 0 &&
|
||||
mbedtls_mpi_cmp_mpi(&grp->G.Z, &ref.G.Z) == 0 &&
|
||||
/* For Y we may only know the parity bit, so compare only that */
|
||||
mbedtls_mpi_get_bit(&grp->G.Y, 0) == mbedtls_mpi_get_bit(&ref.G.Y, 0)) {
|
||||
mbedtls_mpi_cmp_mpi(&grp->P, &ref.P) == 0 &&
|
||||
mbedtls_mpi_cmp_mpi(&grp->A, &ref.A) == 0 &&
|
||||
mbedtls_mpi_cmp_mpi(&grp->B, &ref.B) == 0 &&
|
||||
mbedtls_mpi_cmp_mpi(&grp->N, &ref.N) == 0 &&
|
||||
mbedtls_mpi_cmp_mpi(&grp->G.X, &ref.G.X) == 0 &&
|
||||
mbedtls_mpi_cmp_mpi(&grp->G.Z, &ref.G.Z) == 0 &&
|
||||
/* For Y we may only know the parity bit, so compare only that */
|
||||
mbedtls_mpi_get_bit(&grp->G.Y, 0) == mbedtls_mpi_get_bit(&ref.G.Y, 0)) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -405,8 +399,7 @@ cleanup:
|
|||
* Parse a SpecifiedECDomain (SEC 1 C.2) and find the associated group ID
|
||||
*/
|
||||
static int pk_group_id_from_specified(const mbedtls_asn1_buf *params,
|
||||
mbedtls_ecp_group_id *grp_id)
|
||||
{
|
||||
mbedtls_ecp_group_id *grp_id) {
|
||||
int ret;
|
||||
mbedtls_ecp_group grp;
|
||||
|
||||
|
|
@ -432,8 +425,7 @@ cleanup:
|
|||
* specifiedCurve SpecifiedECDomain -- = SEQUENCE { ... }
|
||||
* -- implicitCurve NULL
|
||||
*/
|
||||
static int pk_use_ecparams(const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp)
|
||||
{
|
||||
static int pk_use_ecparams(const mbedtls_asn1_buf *params, mbedtls_ecp_group *grp) {
|
||||
int ret;
|
||||
mbedtls_ecp_group_id grp_id;
|
||||
|
||||
|
|
@ -469,8 +461,7 @@ static int pk_use_ecparams(const mbedtls_asn1_buf *params, mbedtls_ecp_group *gr
|
|||
* return code of mbedtls_ecp_point_read_binary() and leave p in a usable state.
|
||||
*/
|
||||
static int pk_get_ecpubkey(unsigned char **p, const unsigned char *end,
|
||||
mbedtls_ecp_keypair *key)
|
||||
{
|
||||
mbedtls_ecp_keypair *key) {
|
||||
int ret;
|
||||
|
||||
if ((ret = mbedtls_ecp_point_read_binary(&key->grp, &key->Q,
|
||||
|
|
@ -496,8 +487,7 @@ static int pk_get_ecpubkey(unsigned char **p, const unsigned char *end,
|
|||
*/
|
||||
static int pk_get_rsapubkey(unsigned char **p,
|
||||
const unsigned char *end,
|
||||
mbedtls_rsa_context *rsa)
|
||||
{
|
||||
mbedtls_rsa_context *rsa) {
|
||||
int ret;
|
||||
size_t len;
|
||||
|
||||
|
|
@ -530,7 +520,7 @@ static int pk_get_rsapubkey(unsigned char **p,
|
|||
*p += len;
|
||||
|
||||
if (mbedtls_rsa_complete(rsa) != 0 ||
|
||||
mbedtls_rsa_check_pubkey(rsa) != 0) {
|
||||
mbedtls_rsa_check_pubkey(rsa) != 0) {
|
||||
return (MBEDTLS_ERR_PK_INVALID_PUBKEY);
|
||||
}
|
||||
|
||||
|
|
@ -550,8 +540,7 @@ static int pk_get_rsapubkey(unsigned char **p,
|
|||
*/
|
||||
static int pk_get_pk_alg(unsigned char **p,
|
||||
const unsigned char *end,
|
||||
mbedtls_pk_type_t *pk_alg, mbedtls_asn1_buf *params)
|
||||
{
|
||||
mbedtls_pk_type_t *pk_alg, mbedtls_asn1_buf *params) {
|
||||
int ret;
|
||||
mbedtls_asn1_buf alg_oid;
|
||||
|
||||
|
|
@ -567,8 +556,8 @@ static int pk_get_pk_alg(unsigned char **p,
|
|||
* No parameters with RSA (only for EC)
|
||||
*/
|
||||
if (*pk_alg == MBEDTLS_PK_RSA &&
|
||||
((params->tag != MBEDTLS_ASN1_NULL && params->tag != 0) ||
|
||||
params->len != 0)) {
|
||||
((params->tag != MBEDTLS_ASN1_NULL && params->tag != 0) ||
|
||||
params->len != 0)) {
|
||||
return (MBEDTLS_ERR_PK_INVALID_ALG);
|
||||
}
|
||||
|
||||
|
|
@ -581,8 +570,7 @@ static int pk_get_pk_alg(unsigned char **p,
|
|||
* subjectPublicKey BIT STRING }
|
||||
*/
|
||||
int mbedtls_pk_parse_subpubkey(unsigned char **p, const unsigned char *end,
|
||||
mbedtls_pk_context *pk)
|
||||
{
|
||||
mbedtls_pk_context *pk) {
|
||||
int ret;
|
||||
size_t len;
|
||||
mbedtls_asn1_buf alg_params;
|
||||
|
|
@ -642,8 +630,7 @@ int mbedtls_pk_parse_subpubkey(unsigned char **p, const unsigned char *end,
|
|||
*/
|
||||
static int pk_parse_key_pkcs1_der(mbedtls_rsa_context *rsa,
|
||||
const unsigned char *key,
|
||||
size_t keylen)
|
||||
{
|
||||
size_t keylen) {
|
||||
int ret, version;
|
||||
size_t len;
|
||||
unsigned char *p, *end;
|
||||
|
|
@ -688,40 +675,40 @@ static int pk_parse_key_pkcs1_der(mbedtls_rsa_context *rsa,
|
|||
/* Import N */
|
||||
if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
|
||||
MBEDTLS_ASN1_INTEGER)) != 0 ||
|
||||
(ret = mbedtls_rsa_import_raw(rsa, p, len, NULL, 0, NULL, 0,
|
||||
NULL, 0, NULL, 0)) != 0)
|
||||
(ret = mbedtls_rsa_import_raw(rsa, p, len, NULL, 0, NULL, 0,
|
||||
NULL, 0, NULL, 0)) != 0)
|
||||
goto cleanup;
|
||||
p += len;
|
||||
|
||||
/* Import E */
|
||||
if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
|
||||
MBEDTLS_ASN1_INTEGER)) != 0 ||
|
||||
(ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, NULL, 0,
|
||||
NULL, 0, p, len)) != 0)
|
||||
(ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, NULL, 0,
|
||||
NULL, 0, p, len)) != 0)
|
||||
goto cleanup;
|
||||
p += len;
|
||||
|
||||
/* Import D */
|
||||
if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
|
||||
MBEDTLS_ASN1_INTEGER)) != 0 ||
|
||||
(ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, NULL, 0,
|
||||
p, len, NULL, 0)) != 0)
|
||||
(ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, NULL, 0,
|
||||
p, len, NULL, 0)) != 0)
|
||||
goto cleanup;
|
||||
p += len;
|
||||
|
||||
/* Import P */
|
||||
if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
|
||||
MBEDTLS_ASN1_INTEGER)) != 0 ||
|
||||
(ret = mbedtls_rsa_import_raw(rsa, NULL, 0, p, len, NULL, 0,
|
||||
NULL, 0, NULL, 0)) != 0)
|
||||
(ret = mbedtls_rsa_import_raw(rsa, NULL, 0, p, len, NULL, 0,
|
||||
NULL, 0, NULL, 0)) != 0)
|
||||
goto cleanup;
|
||||
p += len;
|
||||
|
||||
/* Import Q */
|
||||
if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
|
||||
MBEDTLS_ASN1_INTEGER)) != 0 ||
|
||||
(ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, p, len,
|
||||
NULL, 0, NULL, 0)) != 0)
|
||||
(ret = mbedtls_rsa_import_raw(rsa, NULL, 0, NULL, 0, p, len,
|
||||
NULL, 0, NULL, 0)) != 0)
|
||||
goto cleanup;
|
||||
p += len;
|
||||
|
||||
|
|
@ -731,8 +718,8 @@ static int pk_parse_key_pkcs1_der(mbedtls_rsa_context *rsa,
|
|||
|
||||
/* Check optional parameters */
|
||||
if ((ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0 ||
|
||||
(ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0 ||
|
||||
(ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0)
|
||||
(ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0 ||
|
||||
(ret = mbedtls_asn1_get_mpi(&p, end, &T)) != 0)
|
||||
goto cleanup;
|
||||
|
||||
if (p != end) {
|
||||
|
|
@ -764,8 +751,7 @@ cleanup:
|
|||
*/
|
||||
static int pk_parse_key_sec1_der(mbedtls_ecp_keypair *eck,
|
||||
const unsigned char *key,
|
||||
size_t keylen)
|
||||
{
|
||||
size_t keylen) {
|
||||
int ret;
|
||||
int version, pubkey_done;
|
||||
size_t len;
|
||||
|
|
@ -815,7 +801,7 @@ static int pk_parse_key_sec1_der(mbedtls_ecp_keypair *eck,
|
|||
if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
|
||||
MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | 0)) == 0) {
|
||||
if ((ret = pk_get_ecparams(&p, p + len, ¶ms)) != 0 ||
|
||||
(ret = pk_use_ecparams(¶ms, &eck->grp)) != 0) {
|
||||
(ret = pk_use_ecparams(¶ms, &eck->grp)) != 0) {
|
||||
mbedtls_ecp_keypair_free(eck);
|
||||
return (ret);
|
||||
}
|
||||
|
|
@ -858,8 +844,8 @@ static int pk_parse_key_sec1_der(mbedtls_ecp_keypair *eck,
|
|||
}
|
||||
|
||||
if (! pubkey_done &&
|
||||
(ret = mbedtls_ecp_mul(&eck->grp, &eck->Q, &eck->d, &eck->grp.G,
|
||||
NULL, NULL)) != 0) {
|
||||
(ret = mbedtls_ecp_mul(&eck->grp, &eck->Q, &eck->d, &eck->grp.G,
|
||||
NULL, NULL)) != 0) {
|
||||
mbedtls_ecp_keypair_free(eck);
|
||||
return (MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret);
|
||||
}
|
||||
|
|
@ -889,8 +875,7 @@ static int pk_parse_key_sec1_der(mbedtls_ecp_keypair *eck,
|
|||
static int pk_parse_key_pkcs8_unencrypted_der(
|
||||
mbedtls_pk_context *pk,
|
||||
const unsigned char *key,
|
||||
size_t keylen)
|
||||
{
|
||||
size_t keylen) {
|
||||
int ret, version;
|
||||
size_t len;
|
||||
mbedtls_asn1_buf params;
|
||||
|
|
@ -955,7 +940,7 @@ static int pk_parse_key_pkcs8_unencrypted_der(
|
|||
#if defined(MBEDTLS_ECP_C)
|
||||
if (pk_alg == MBEDTLS_PK_ECKEY || pk_alg == MBEDTLS_PK_ECKEY_DH) {
|
||||
if ((ret = pk_use_ecparams(¶ms, &mbedtls_pk_ec(*pk)->grp)) != 0 ||
|
||||
(ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk), p, len)) != 0) {
|
||||
(ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk), p, len)) != 0) {
|
||||
mbedtls_pk_free(pk);
|
||||
return (ret);
|
||||
}
|
||||
|
|
@ -979,8 +964,7 @@ static int pk_parse_key_pkcs8_unencrypted_der(
|
|||
static int pk_parse_key_pkcs8_encrypted_der(
|
||||
mbedtls_pk_context *pk,
|
||||
unsigned char *key, size_t keylen,
|
||||
const unsigned char *pwd, size_t pwdlen)
|
||||
{
|
||||
const unsigned char *pwd, size_t pwdlen) {
|
||||
int ret, decrypted = 0;
|
||||
size_t len;
|
||||
unsigned char *buf;
|
||||
|
|
@ -1088,8 +1072,7 @@ static int pk_parse_key_pkcs8_encrypted_der(
|
|||
*/
|
||||
int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
|
||||
const unsigned char *key, size_t keylen,
|
||||
const unsigned char *pwd, size_t pwdlen)
|
||||
{
|
||||
const unsigned char *pwd, size_t pwdlen) {
|
||||
int ret;
|
||||
const mbedtls_pk_info_t *pk_info;
|
||||
|
||||
|
|
@ -1112,8 +1095,8 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
|
|||
if (ret == 0) {
|
||||
pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA);
|
||||
if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
|
||||
(ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),
|
||||
pem.buf, pem.buflen)) != 0) {
|
||||
(ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),
|
||||
pem.buf, pem.buflen)) != 0) {
|
||||
mbedtls_pk_free(pk);
|
||||
}
|
||||
|
||||
|
|
@ -1140,8 +1123,8 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
|
|||
pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
|
||||
|
||||
if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
|
||||
(ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk),
|
||||
pem.buf, pem.buflen)) != 0) {
|
||||
(ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk),
|
||||
pem.buf, pem.buflen)) != 0) {
|
||||
mbedtls_pk_free(pk);
|
||||
}
|
||||
|
||||
|
|
@ -1245,8 +1228,8 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
|
|||
|
||||
pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA);
|
||||
if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
|
||||
(ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),
|
||||
key, keylen)) != 0) {
|
||||
(ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),
|
||||
key, keylen)) != 0) {
|
||||
mbedtls_pk_free(pk);
|
||||
} else {
|
||||
return (0);
|
||||
|
|
@ -1258,8 +1241,8 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
|
|||
|
||||
pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_ECKEY);
|
||||
if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
|
||||
(ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk),
|
||||
key, keylen)) != 0) {
|
||||
(ret = pk_parse_key_sec1_der(mbedtls_pk_ec(*pk),
|
||||
key, keylen)) != 0) {
|
||||
mbedtls_pk_free(pk);
|
||||
} else {
|
||||
return (0);
|
||||
|
|
@ -1274,8 +1257,7 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
|
|||
* Parse a public key
|
||||
*/
|
||||
int mbedtls_pk_parse_public_key(mbedtls_pk_context *ctx,
|
||||
const unsigned char *key, size_t keylen)
|
||||
{
|
||||
const unsigned char *key, size_t keylen) {
|
||||
int ret;
|
||||
unsigned char *p;
|
||||
#if defined(MBEDTLS_RSA_C)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue