1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libcrypto/chacha/chacha.c b/src/lib/libcrypto/chacha/chacha.c
index b8422306fa..0c384ab88a 100644
--- a/src/lib/libcrypto/chacha/chacha.c
+++ b/src/lib/libcrypto/chacha/chacha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chacha.c,v 1.6 2014/07/08 14:30:23 bcook Exp $ */
+/* $OpenBSD: chacha.c,v 1.7 2015/12/09 14:07:55 bcook Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -57,7 +57,7 @@ ChaCha(ChaCha_ctx *ctx, unsigned char *out, const unsigned char *in, size_t len)
 
 void
 CRYPTO_chacha_20(unsigned char *out, const unsigned char *in, size_t len,
-    const unsigned char key[32], const unsigned char iv[8], size_t counter)
+    const unsigned char key[32], const unsigned char iv[8], uint64_t counter)
 {
         struct chacha_ctx ctx;
 
@@ -70,7 +70,7 @@ CRYPTO_chacha_20(unsigned char *out, const unsigned char *in, size_t len,
         chacha_ivsetup(&ctx, iv, NULL);
         if (counter != 0) {
                 ctx.input[12] = (uint32_t)counter;
-                ctx.input[13] = (uint32_t)(((uint64_t)counter) >> 32);
+                ctx.input[13] = (uint32_t)(counter >> 32);
         }
 
         chacha_encrypt_bytes(&ctx, in, out, (uint32_t)len);