diff options
author | Dirkjan Bussink <d.bussink@gmail.com> | 2014-04-20 09:53:47 +0000 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2014-04-22 10:55:59 +0200 |
commit | 4a089026647073be32ddb0885c12f47496bc709b (patch) | |
tree | cec94a4f40b1555aff10f7333ce274334c24d3c5 /include | |
parent | d6e6a453fc2b362174e9e0a8669574283b515245 (diff) | |
download | libssh-4a089026647073be32ddb0885c12f47496bc709b.tar.gz libssh-4a089026647073be32ddb0885c12f47496bc709b.tar.xz libssh-4a089026647073be32ddb0885c12f47496bc709b.zip |
Add SHA2 algorithms for HMAC
BUG: https://red.libssh.org/issues/91
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/libssh/libcrypto.h | 13 | ||||
-rw-r--r-- | include/libssh/libgcrypt.h | 8 | ||||
-rw-r--r-- | include/libssh/wrapper.h | 18 |
3 files changed, 38 insertions, 1 deletions
diff --git a/include/libssh/libcrypto.h b/include/libssh/libcrypto.h index 5cf2da28..c3783880 100644 --- a/include/libssh/libcrypto.h +++ b/include/libssh/libcrypto.h @@ -36,6 +36,8 @@ typedef SHA_CTX* SHACTX; typedef SHA256_CTX* SHA256CTX; +typedef SHA512_CTX* SHA384CTX; +typedef SHA512_CTX* SHA512CTX; typedef MD5_CTX* MD5CTX; typedef HMAC_CTX* HMACCTX; #ifdef HAVE_ECC @@ -45,6 +47,9 @@ typedef void *EVPCTX; #endif #define SHA_DIGEST_LEN SHA_DIGEST_LENGTH +#define SHA256_DIGEST_LEN SHA256_DIGEST_LENGTH +#define SHA384_DIGEST_LEN SHA384_DIGEST_LENGTH +#define SHA512_DIGEST_LEN SHA512_DIGEST_LENGTH #ifdef MD5_DIGEST_LEN #undef MD5_DIGEST_LEN #endif @@ -84,6 +89,14 @@ SHA256CTX sha256_init(void); void sha256_update(SHA256CTX c, const void *data, unsigned long len); void sha256_final(unsigned char *md, SHA256CTX c); +SHA384CTX sha384_init(void); +void sha384_update(SHA384CTX c, const void *data, unsigned long len); +void sha384_final(unsigned char *md, SHA384CTX c); + +SHA512CTX sha512_init(void); +void sha512_update(SHA512CTX c, const void *data, unsigned long len); +void sha512_final(unsigned char *md, SHA512CTX c); + struct ssh_cipher_struct *ssh_get_ciphertab(void); #endif /* HAVE_LIBCRYPTO */ diff --git a/include/libssh/libgcrypt.h b/include/libssh/libgcrypt.h index c1844a53..8e52a681 100644 --- a/include/libssh/libgcrypt.h +++ b/include/libssh/libgcrypt.h @@ -27,6 +27,9 @@ #include <gcrypt.h> typedef gcry_md_hd_t SHACTX; +typedef gcry_md_hd_t SHA256CTX; +typedef gcry_md_hd_t SHA384CTX; +typedef gcry_md_hd_t SHA512CTX; typedef gcry_md_hd_t MD5CTX; typedef gcry_md_hd_t HMACCTX; typedef void *EVPCTX; @@ -34,11 +37,14 @@ typedef void *EVPCTX; #define SHA_DIGEST_LEN SHA_DIGEST_LENGTH #define MD5_DIGEST_LEN 16 #define SHA256_DIGEST_LENGTH 32 +#define SHA256_DIGEST_LEN SHA256_DIGEST_LENGTH #define SHA384_DIGEST_LENGTH 48 +#define SHA384_DIGEST_LEN SHA384_DIGEST_LENGTH #define SHA512_DIGEST_LENGTH 64 +#define SHA512_DIGEST_LEN SHA512_DIGEST_LENGTH #ifndef EVP_MAX_MD_SIZE -#define EVP_MAX_MD_SIZE 36 +#define EVP_MAX_MD_SIZE 64 #endif #define EVP_DIGEST_LEN EVP_MAX_MD_SIZE diff --git a/include/libssh/wrapper.h b/include/libssh/wrapper.h index e8ff32c1..41f1e3e6 100644 --- a/include/libssh/wrapper.h +++ b/include/libssh/wrapper.h @@ -34,6 +34,9 @@ enum ssh_mac_e { enum ssh_hmac_e { SSH_HMAC_SHA1 = 1, + SSH_HMAC_SHA256, + SSH_HMAC_SHA384, + SSH_HMAC_SHA512, SSH_HMAC_MD5 }; @@ -46,12 +49,27 @@ 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(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(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(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(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); |