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

pki_crypto: Reformat pki_key_compare

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Sahana Prasad <sahana@redhat.com>
This commit is contained in:
Jakub Jelen
2025-01-23 11:42:21 +01:00
parent 12b8eed093
commit 520f758902
1 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/pki_crypto.c
View File

@@ -811,73 +811,71 @@ int pki_key_generate_ecdsa(ssh_key key, int parameter)
/* With OpenSSL 3.0 and higher the parameter 'what' /* With OpenSSL 3.0 and higher the parameter 'what'
* is ignored and the comparison is done by OpenSSL * is ignored and the comparison is done by OpenSSL
*/ */
int pki_key_compare(const ssh_key k1, int pki_key_compare(const ssh_key k1, const ssh_key k2, enum ssh_keycmp_e what)
const ssh_key k2,
enum ssh_keycmp_e what)
{ {
int rc; int rc;
(void)what; (void)what;
switch (ssh_key_type_plain(k1->type)) { switch (ssh_key_type_plain(k1->type)) {
case SSH_KEYTYPE_ECDSA_P256: case SSH_KEYTYPE_ECDSA_P256:
case SSH_KEYTYPE_ECDSA_P384: case SSH_KEYTYPE_ECDSA_P384:
case SSH_KEYTYPE_ECDSA_P521: case SSH_KEYTYPE_ECDSA_P521:
case SSH_KEYTYPE_SK_ECDSA: case SSH_KEYTYPE_SK_ECDSA:
#if OPENSSL_VERSION_NUMBER < 0x30000000L #if OPENSSL_VERSION_NUMBER < 0x30000000L
#ifdef HAVE_OPENSSL_ECC #ifdef HAVE_OPENSSL_ECC
{ {
const EC_KEY *ec1 = EVP_PKEY_get0_EC_KEY(k1->key); const EC_KEY *ec1 = EVP_PKEY_get0_EC_KEY(k1->key);
const EC_KEY *ec2 = EVP_PKEY_get0_EC_KEY(k2->key); const EC_KEY *ec2 = EVP_PKEY_get0_EC_KEY(k2->key);
const EC_POINT *p1 = NULL; const EC_POINT *p1 = NULL;
const EC_POINT *p2 = NULL; const EC_POINT *p2 = NULL;
const EC_GROUP *g1 = NULL; const EC_GROUP *g1 = NULL;
const EC_GROUP *g2 = NULL; const EC_GROUP *g2 = NULL;
if (ec1 == NULL || ec2 == NULL) { if (ec1 == NULL || ec2 == NULL) {
return 1; return 1;
} }
p1 = EC_KEY_get0_public_key(ec1); p1 = EC_KEY_get0_public_key(ec1);
p2 = EC_KEY_get0_public_key(ec2); p2 = EC_KEY_get0_public_key(ec2);
g1 = EC_KEY_get0_group(ec1); g1 = EC_KEY_get0_group(ec1);
g2 = EC_KEY_get0_group(ec2); g2 = EC_KEY_get0_group(ec2);
if (p1 == NULL || p2 == NULL || g1 == NULL || g2 == NULL) { if (p1 == NULL || p2 == NULL || g1 == NULL || g2 == NULL) {
return 1; return 1;
} }
if (EC_GROUP_cmp(g1, g2, NULL) != 0) { if (EC_GROUP_cmp(g1, g2, NULL) != 0) {
return 1; return 1;
} }
if (EC_POINT_cmp(g1, p1, p2, NULL) != 0) { if (EC_POINT_cmp(g1, p1, p2, NULL) != 0) {
return 1; return 1;
} }
if (what == SSH_KEY_CMP_PRIVATE) { if (what == SSH_KEY_CMP_PRIVATE) {
if (bignum_cmp(EC_KEY_get0_private_key(ec1), if (bignum_cmp(EC_KEY_get0_private_key(ec1),
EC_KEY_get0_private_key(ec2))) { EC_KEY_get0_private_key(ec2))) {
return 1;
}
}
break;
}
#endif /* HAVE_OPENSSL_ECC */
#endif /* OPENSSL_VERSION_NUMBER */
case SSH_KEYTYPE_RSA:
case SSH_KEYTYPE_RSA1:
rc = EVP_PKEY_eq(k1->key, k2->key);
if (rc != 1) {
return 1; return 1;
} }
break; }
case SSH_KEYTYPE_ED25519: break;
case SSH_KEYTYPE_SK_ED25519: }
/* ed25519 keys handled globally */ #endif /* HAVE_OPENSSL_ECC */
case SSH_KEYTYPE_UNKNOWN: #endif /* OPENSSL_VERSION_NUMBER */
default: case SSH_KEYTYPE_RSA:
case SSH_KEYTYPE_RSA1:
rc = EVP_PKEY_eq(k1->key, k2->key);
if (rc != 1) {
return 1; return 1;
}
break;
case SSH_KEYTYPE_ED25519:
case SSH_KEYTYPE_SK_ED25519:
/* ed25519 keys handled globally */
case SSH_KEYTYPE_UNKNOWN:
default:
return 1;
} }
return 0; return 0;
} }