shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-10 10:26:47 +09:00
Code Issues Packages Projects Releases Wiki Activity

mbedcrypto: Simplify copy&paste code between v2 and v3

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Sahana Prasad <sahana@redhat.com>
This commit is contained in:
Jakub Jelen
2024-04-15 12:07:13 +02:00
parent b815ca08b3
commit fc5dd6f57c
1 changed files with 22 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/pki_mbedcrypto.c
View File

@@ -128,56 +128,43 @@ ssh_key pki_private_key_from_base64(const char *b64_key, const char *passphrase,
if (valid < 0) { if (valid < 0) {
goto fail; goto fail;
} }
#if MBEDTLS_VERSION_MAJOR > 2
valid = mbedtls_pk_parse_key( valid = mbedtls_pk_parse_key(
pk, pk,
(const unsigned char *)b64_key, (const unsigned char *)b64_key,
b64len, b64len,
tmp, tmp,
strnlen((const char *)tmp, MAX_PASSPHRASE_SIZE), strnlen((const char *)tmp, MAX_PASSPHRASE_SIZE)
#if MBEDTLS_VERSION_MAJOR > 2
,
mbedtls_ctr_drbg_random, mbedtls_ctr_drbg_random,
ctr_drbg); ctr_drbg
#else
valid = mbedtls_pk_parse_key(
pk,
(const unsigned char *)b64_key,
b64len,
tmp,
strnlen((const char *)tmp, MAX_PASSPHRASE_SIZE));
#endif #endif
);
} else { } else {
valid = mbedtls_pk_parse_key(pk,
(const unsigned char *)b64_key,
b64len,
NULL,
0
#if MBEDTLS_VERSION_MAJOR > 2 #if MBEDTLS_VERSION_MAJOR > 2
valid = mbedtls_pk_parse_key(pk, ,
(const unsigned char *)b64_key,
b64len,
NULL,
0,
mbedtls_ctr_drbg_random, mbedtls_ctr_drbg_random,
ctr_drbg); ctr_drbg
#else
valid = mbedtls_pk_parse_key(pk,
(const unsigned char *)b64_key,
b64len,
NULL,
0);
#endif #endif
);
} }
} else { } else {
valid = mbedtls_pk_parse_key(pk,
(const unsigned char *)b64_key,
b64len,
(const unsigned char *)passphrase,
strnlen(passphrase, MAX_PASSPHRASE_SIZE)
#if MBEDTLS_VERSION_MAJOR > 2 #if MBEDTLS_VERSION_MAJOR > 2
valid = mbedtls_pk_parse_key(pk, ,
(const unsigned char *)b64_key,
b64len,
(const unsigned char *)passphrase,
strnlen(passphrase, MAX_PASSPHRASE_SIZE),
mbedtls_ctr_drbg_random, mbedtls_ctr_drbg_random,
ctr_drbg); ctr_drbg
#else
valid = mbedtls_pk_parse_key(pk,
(const unsigned char *)b64_key,
b64len,
(const unsigned char *)passphrase,
strnlen(passphrase, MAX_PASSPHRASE_SIZE));
#endif #endif
);
} }
if (valid != 0) { if (valid != 0) {
char error_buf[100]; char error_buf[100];
@@ -329,13 +316,11 @@ int pki_pubkey_build_rsa(ssh_key key, ssh_string e, ssh_string n)
goto fail; goto fail;
} }
rsa = mbedtls_pk_rsa(*key->rsa);
#if MBEDTLS_VERSION_MAJOR > 2 #if MBEDTLS_VERSION_MAJOR > 2
mbedtls_mpi_init(&N); mbedtls_mpi_init(&N);
mbedtls_mpi_init(&E); mbedtls_mpi_init(&E);
#endif
rsa = mbedtls_pk_rsa(*key->rsa);
#if MBEDTLS_VERSION_MAJOR > 2
rc = mbedtls_mpi_read_binary(&N, ssh_string_data(n), rc = mbedtls_mpi_read_binary(&N, ssh_string_data(n),
ssh_string_len(n)); ssh_string_len(n));
#else #else