mirror of
https://git.libssh.org/projects/libssh.git
synced 2025-11-30 13:01:23 +03:00
1ebf506913
Generally, when the extension negotiation is enabled and client supports SHA2 algorithms for RSA, they are supposed to be prioritized against the old SHA1. If it is not (ssh-rsa is listed in front of rsa-sha2-* hostkey algorithms during negotiation), the server wrongly tries to provide the new typo of signature, ignoring the negotiated algirithm This commit propagates the digest algorithm from negotiation to the actual signature functions, which were previously responsible for decision about the hash algorithm based just on the negotiated extensions. Fixes T191 Signed-off-by: Jakub Jelen <jjelen@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
123 lines
3.8 KiB
C
123 lines
3.8 KiB
C
/*
|
|
* This file is part of the SSH Library
|
|
*
|
|
* Copyright (c) 2009 by Aris Adamantiadis
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef WRAPPER_H_
|
|
#define WRAPPER_H_
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "config.h"
|
|
#include "libssh/libssh.h"
|
|
#include "libssh/libcrypto.h"
|
|
#include "libssh/libgcrypt.h"
|
|
#include "libssh/libmbedcrypto.h"
|
|
|
|
enum ssh_kdf_digest {
|
|
SSH_KDF_SHA1=1,
|
|
SSH_KDF_SHA256,
|
|
SSH_KDF_SHA384,
|
|
SSH_KDF_SHA512
|
|
};
|
|
|
|
enum ssh_hmac_e {
|
|
SSH_HMAC_SHA1 = 1,
|
|
SSH_HMAC_SHA256,
|
|
SSH_HMAC_SHA512,
|
|
SSH_HMAC_MD5,
|
|
SSH_HMAC_AEAD_POLY1305,
|
|
SSH_HMAC_AEAD_GCM
|
|
};
|
|
|
|
enum ssh_des_e {
|
|
SSH_3DES,
|
|
SSH_DES
|
|
};
|
|
|
|
struct ssh_hmac_struct {
|
|
const char* name;
|
|
enum ssh_hmac_e hmac_type;
|
|
bool etm;
|
|
};
|
|
|
|
enum ssh_crypto_direction_e {
|
|
SSH_DIRECTION_IN = 1,
|
|
SSH_DIRECTION_OUT = 2,
|
|
SSH_DIRECTION_BOTH = 3,
|
|
};
|
|
|
|
struct ssh_cipher_struct;
|
|
struct ssh_crypto_struct;
|
|
|
|
typedef struct ssh_mac_ctx_struct *ssh_mac_ctx;
|
|
MD5CTX md5_init(void);
|
|
void md5_update(MD5CTX c, const void *data, unsigned long len);
|
|
void md5_final(unsigned char *md,MD5CTX c);
|
|
|
|
SHACTX sha1_init(void);
|
|
void sha1_update(SHACTX c, const void *data, unsigned long len);
|
|
void sha1_final(unsigned char *md,SHACTX c);
|
|
void sha1(const unsigned char *digest,int len,unsigned char *hash);
|
|
|
|
SHA256CTX sha256_init(void);
|
|
void sha256_update(SHA256CTX c, const void *data, unsigned long len);
|
|
void sha256_final(unsigned char *md,SHA256CTX c);
|
|
void sha256(const unsigned char *digest, int len, unsigned char *hash);
|
|
|
|
SHA384CTX sha384_init(void);
|
|
void sha384_update(SHA384CTX c, const void *data, unsigned long len);
|
|
void sha384_final(unsigned char *md,SHA384CTX c);
|
|
void sha384(const unsigned char *digest, int len, unsigned char *hash);
|
|
|
|
SHA512CTX sha512_init(void);
|
|
void sha512_update(SHA512CTX c, const void *data, unsigned long len);
|
|
void sha512_final(unsigned char *md,SHA512CTX c);
|
|
void sha512(const unsigned char *digest, int len, unsigned char *hash);
|
|
|
|
void evp(int nid, unsigned char *digest, int len, unsigned char *hash, unsigned int *hlen);
|
|
EVPCTX evp_init(int nid);
|
|
void evp_update(EVPCTX ctx, const void *data, unsigned long len);
|
|
void evp_final(EVPCTX ctx, unsigned char *md, unsigned int *mdlen);
|
|
|
|
HMACCTX hmac_init(const void *key,int len, enum ssh_hmac_e type);
|
|
void hmac_update(HMACCTX c, const void *data, unsigned long len);
|
|
void hmac_final(HMACCTX ctx,unsigned char *hashmacbuf,unsigned int *len);
|
|
size_t hmac_digest_len(enum ssh_hmac_e type);
|
|
|
|
int ssh_kdf(struct ssh_crypto_struct *crypto,
|
|
unsigned char *key, size_t key_len,
|
|
int key_type, unsigned char *output,
|
|
size_t requested_len);
|
|
|
|
int crypt_set_algorithms_client(ssh_session session);
|
|
int crypt_set_algorithms_server(ssh_session session);
|
|
struct ssh_crypto_struct *crypto_new(void);
|
|
void crypto_free(struct ssh_crypto_struct *crypto);
|
|
|
|
void ssh_reseed(void);
|
|
int ssh_crypto_init(void);
|
|
void ssh_crypto_finalize(void);
|
|
|
|
void ssh_cipher_clear(struct ssh_cipher_struct *cipher);
|
|
struct ssh_hmac_struct *ssh_get_hmactab(void);
|
|
struct ssh_cipher_struct *ssh_get_ciphertab(void);
|
|
const char *ssh_hmac_type_to_string(enum ssh_hmac_e hmac_type, bool etm);
|
|
|
|
#endif /* WRAPPER_H_ */
|