From 7e7566753ff3adb97ae86b5d650e76acdea4c1a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Thu, 9 Aug 2018 20:27:57 +0200
Subject: [PATCH] des-compat.c: Change length argument type from uint32_t to
size_t.
(cherry picked from commit f3bbc422efed4149b5661e064360ee678b23113a)
---
ChangeLog | 6 ++++++
des-compat.c | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 231cb8ce..e276ef43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-09 Niels Möller <nisse@lysator.liu.se>
+
+ Backported from master branch.
+ * des-compat.c (des_compat_des3_encrypt)
+ (des_compat_des3_decrypt): Change length argument type to size_t.
+
2017-11-19 Niels Möller <nisse@lysator.liu.se>
* Released nettle-3.4.
diff --git a/des-compat.c b/des-compat.c
index 0e7b2327..689dfe09 100644
--- a/des-compat.c
+++ b/des-compat.c
@@ -48,7 +48,7 @@ struct des_compat_des3 { const struct des_ctx *keys[3]; };
static void
des_compat_des3_encrypt(struct des_compat_des3 *ctx,
- uint32_t length, uint8_t *dst, const uint8_t *src)
+ size_t length, uint8_t *dst, const uint8_t *src)
{
nettle_des_encrypt(ctx->keys[0], length, dst, src);
nettle_des_decrypt(ctx->keys[1], length, dst, dst);
@@ -57,7 +57,7 @@ des_compat_des3_encrypt(struct des_compat_des3 *ctx,
static void
des_compat_des3_decrypt(struct des_compat_des3 *ctx,
- uint32_t length, uint8_t *dst, const uint8_t *src)
+ size_t length, uint8_t *dst, const uint8_t *src)
{
nettle_des_decrypt(ctx->keys[2], length, dst, src);
nettle_des_encrypt(ctx->keys[1], length, dst, dst);
--
GitLab