mirror of
https://git.libssh.org/projects/libssh.git
synced 2025-12-14 04:18:54 +03:00
CVE-2023-6918: Remove unused evp functions and types
Signed-off-by: Jakub Jelen <jjelen@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
committed by
Andreas Schneider
parent
a16f34c57a
commit
10c200037a
@@ -69,59 +69,6 @@ static int alloc_key(struct ssh_cipher_struct *cipher) {
|
||||
void ssh_reseed(void){
|
||||
}
|
||||
|
||||
#ifdef HAVE_GCRYPT_ECC
|
||||
static int nid_to_md_algo(int nid)
|
||||
{
|
||||
switch (nid) {
|
||||
case NID_gcrypt_nistp256:
|
||||
return GCRY_MD_SHA256;
|
||||
case NID_gcrypt_nistp384:
|
||||
return GCRY_MD_SHA384;
|
||||
case NID_gcrypt_nistp521:
|
||||
return GCRY_MD_SHA512;
|
||||
}
|
||||
return GCRY_MD_NONE;
|
||||
}
|
||||
|
||||
void evp(int nid, unsigned char *digest, size_t len,
|
||||
unsigned char *hash, unsigned int *hlen)
|
||||
{
|
||||
int algo = nid_to_md_algo(nid);
|
||||
|
||||
/* Note: What gcrypt calls 'hash' is called 'digest' here and
|
||||
vice-versa. */
|
||||
gcry_md_hash_buffer(algo, hash, digest, len);
|
||||
*hlen = gcry_md_get_algo_dlen(algo);
|
||||
}
|
||||
|
||||
EVPCTX evp_init(int nid)
|
||||
{
|
||||
gcry_error_t err;
|
||||
int algo = nid_to_md_algo(nid);
|
||||
EVPCTX ctx;
|
||||
|
||||
err = gcry_md_open(&ctx, algo, 0);
|
||||
if (err) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return ctx;
|
||||
}
|
||||
|
||||
void evp_update(EVPCTX ctx, const void *data, size_t len)
|
||||
{
|
||||
gcry_md_write(ctx, data, len);
|
||||
}
|
||||
|
||||
void evp_final(EVPCTX ctx, unsigned char *md, unsigned int *mdlen)
|
||||
{
|
||||
int algo = gcry_md_get_algo(ctx);
|
||||
*mdlen = gcry_md_get_algo_dlen(algo);
|
||||
memcpy(md, gcry_md_read(ctx, algo), *mdlen);
|
||||
gcry_md_close(ctx);
|
||||
}
|
||||
#endif
|
||||
|
||||
int ssh_kdf(struct ssh_crypto_struct *crypto,
|
||||
unsigned char *key, size_t key_len,
|
||||
uint8_t key_type, unsigned char *output,
|
||||
|
||||
Reference in New Issue
Block a user