aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilo Eckert <tilo.eckert@flam.de>2019-02-18 12:39:47 +0100
committerAndreas Schneider <asn@cryptomilk.org>2019-02-21 10:51:22 +0100
commit17df34da9621b7c81666f9a1af98f3065627a502 (patch)
treef058053c486b5121314e5c8641fbcd4b45e88359
parent7caf6d2ab62dc2ac964808cedae48d75c4156ddd (diff)
downloadlibssh-17df34da9621b7c81666f9a1af98f3065627a502.tar.gz
libssh-17df34da9621b7c81666f9a1af98f3065627a502.tar.xz
libssh-17df34da9621b7c81666f9a1af98f3065627a502.zip
crypto: Use uint8_t instead of non-standard u_char
Signed-off-by: Tilo Eckert <tilo.eckert@flam.de> Reviewed-by: Andreas Schneider <asn@cryptomilk.org> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
-rw-r--r--src/libcrypto.c8
-rw-r--r--src/libmbedcrypto.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libcrypto.c b/src/libcrypto.c
index d578903f..ca8b5564 100644
--- a/src/libcrypto.c
+++ b/src/libcrypto.c
@@ -543,7 +543,7 @@ static int evp_cipher_set_encrypt_key(struct ssh_cipher_struct *cipher,
rc = EVP_CIPHER_CTX_ctrl(cipher->ctx,
EVP_CTRL_GCM_SET_IV_FIXED,
-1,
- (u_char *)IV);
+ (uint8_t *)IV);
if (rc != 1) {
SSH_LOG(SSH_LOG_WARNING, "EVP_CTRL_GCM_SET_IV_FIXED failed");
return SSH_ERROR;
@@ -576,7 +576,7 @@ static int evp_cipher_set_decrypt_key(struct ssh_cipher_struct *cipher,
rc = EVP_CIPHER_CTX_ctrl(cipher->ctx,
EVP_CTRL_GCM_SET_IV_FIXED,
-1,
- (u_char *)IV);
+ (uint8_t *)IV);
if (rc != 1) {
SSH_LOG(SSH_LOG_WARNING, "EVP_CTRL_GCM_SET_IV_FIXED failed");
return SSH_ERROR;
@@ -728,7 +728,7 @@ evp_cipher_aead_encrypt(struct ssh_cipher_struct *cipher,
uint64_t seq)
{
size_t authlen, aadlen;
- u_char lastiv[1];
+ uint8_t lastiv[1];
int tmplen = 0;
size_t outlen;
int rc;
@@ -800,7 +800,7 @@ evp_cipher_aead_decrypt(struct ssh_cipher_struct *cipher,
uint64_t seq)
{
size_t authlen, aadlen;
- u_char lastiv[1];
+ uint8_t lastiv[1];
int outlen = 0;
int rc = 0;
diff --git a/src/libmbedcrypto.c b/src/libmbedcrypto.c
index d5945c27..b6a0379e 100644
--- a/src/libmbedcrypto.c
+++ b/src/libmbedcrypto.c
@@ -925,9 +925,9 @@ cipher_decrypt_gcm(struct ssh_cipher_struct *cipher,
AES_GCM_IVLEN,
complete_packet, /* aad */
aadlen,
- (const u_char *)complete_packet + aadlen + encrypted_size, /* tag */
+ (const uint8_t *)complete_packet + aadlen + encrypted_size, /* tag */
authlen,
- (const u_char *)complete_packet + aadlen, /* input */
+ (const uint8_t *)complete_packet + aadlen, /* input */
(unsigned char *)out); /* output */
if (rc != 0) {
SSH_LOG(SSH_LOG_WARNING, "mbedtls_gcm_auth_decrypt failed");