diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2018-11-30 17:23:37 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2018-11-30 18:25:12 +0100 |
commit | c6ca62d7e166271a8470fa7e327b03845a0c1f3f (patch) | |
tree | 590dab12dca4f6976d37f0c384d6ff85e65677c5 /src/libcrypto.c | |
parent | 6d3672911bcd5fbe85967f8e16ac29aca53d6549 (diff) | |
download | libssh-c6ca62d7e166271a8470fa7e327b03845a0c1f3f.tar.gz libssh-c6ca62d7e166271a8470fa7e327b03845a0c1f3f.tar.xz libssh-c6ca62d7e166271a8470fa7e327b03845a0c1f3f.zip |
crypto: Use size_t for len argument in encrypt and decrpyt fn
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/libcrypto.c')
-rw-r--r-- | src/libcrypto.c | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/src/libcrypto.c b/src/libcrypto.c index d1f93978..fb77c89f 100644 --- a/src/libcrypto.c +++ b/src/libcrypto.c @@ -596,20 +596,25 @@ static int evp_cipher_set_decrypt_key(struct ssh_cipher_struct *cipher, /* EVP wrapper function for encrypt/decrypt */ static void evp_cipher_encrypt(struct ssh_cipher_struct *cipher, - void *in, - void *out, - unsigned long len) { + void *in, + void *out, + size_t len) +{ int outlen = 0; int rc = 0; - rc = EVP_EncryptUpdate(cipher->ctx, (unsigned char *)out, &outlen, (unsigned char *)in, len); + rc = EVP_EncryptUpdate(cipher->ctx, + (unsigned char *)out, + &outlen, + (unsigned char *)in, + (int)len); if (rc != 1){ SSH_LOG(SSH_LOG_WARNING, "EVP_EncryptUpdate failed"); return; } if (outlen != (int)len){ SSH_LOG(SSH_LOG_WARNING, - "EVP_EncryptUpdate: output size %d for %lu in", + "EVP_EncryptUpdate: output size %d for %zu in", outlen, len); return; @@ -617,20 +622,25 @@ static void evp_cipher_encrypt(struct ssh_cipher_struct *cipher, } static void evp_cipher_decrypt(struct ssh_cipher_struct *cipher, - void *in, - void *out, - unsigned long len) { + void *in, + void *out, + size_t len) +{ int outlen = 0; int rc = 0; - rc = EVP_DecryptUpdate(cipher->ctx, (unsigned char *)out, &outlen, (unsigned char *)in, len); + rc = EVP_DecryptUpdate(cipher->ctx, + (unsigned char *)out, + &outlen, + (unsigned char *)in, + (int)len); if (rc != 1){ SSH_LOG(SSH_LOG_WARNING, "EVP_DecryptUpdate failed"); return; } if (outlen != (int)len){ SSH_LOG(SSH_LOG_WARNING, - "EVP_DecryptUpdate: output size %d for %lu in", + "EVP_DecryptUpdate: output size %d for %zu in", outlen, len); return; @@ -747,8 +757,8 @@ evp_cipher_aead_encrypt(struct ssh_cipher_struct *cipher, NULL, &outlen, (unsigned char *)in, - aadlen); - if (rc == 0 || outlen != aadlen) { + (int)aadlen); + if (rc == 0 || outlen != (int)aadlen) { SSH_LOG(SSH_LOG_WARNING, "Failed to pass authenticated data"); return; } @@ -759,7 +769,7 @@ evp_cipher_aead_encrypt(struct ssh_cipher_struct *cipher, (unsigned char *)out + aadlen, &outlen, (unsigned char *)in + aadlen, - len - aadlen); + (int)len - aadlen); if (rc != 1 || outlen != len - aadlen) { SSH_LOG(SSH_LOG_WARNING, "EVP_EncryptUpdate failed"); return; @@ -826,7 +836,7 @@ evp_cipher_aead_decrypt(struct ssh_cipher_struct *cipher, NULL, &outlen, (unsigned char *)complete_packet, - aadlen); + (int)aadlen); if (rc == 0) { SSH_LOG(SSH_LOG_WARNING, "Failed to pass authenticated data"); return SSH_ERROR; |