From c642c67f55e80c1f3eb1966dd740b397ddf64e6d Mon Sep 17 00:00:00 2001 From: bcook <> Date: Fri, 11 Jul 2014 08:47:47 +0000 Subject: replace u_int8_t with uint8_t ok beck@ --- src/lib/libcrypto/chacha/chacha-merged.c | 8 +++++--- src/lib/libssl/src/crypto/chacha/chacha-merged.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libcrypto/chacha/chacha-merged.c b/src/lib/libcrypto/chacha/chacha-merged.c index a665fb316f..557dfd5b56 100644 --- a/src/lib/libcrypto/chacha/chacha-merged.c +++ b/src/lib/libcrypto/chacha/chacha-merged.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chacha-merged.c,v 1.6 2014/06/24 18:12:09 jsing Exp $ */ +/* $OpenBSD: chacha-merged.c,v 1.7 2014/07/11 08:47:47 bcook Exp $ */ /* chacha-merged.c version 20080118 D. J. Bernstein @@ -7,6 +7,8 @@ Public domain. #include +#include + #define CHACHA_MINKEYLEN 16 #define CHACHA_NONCELEN 8 #define CHACHA_CTRLEN 8 @@ -15,8 +17,8 @@ Public domain. struct chacha_ctx { u_int input[16]; - u_int8_t ks[CHACHA_BLOCKLEN]; - u_int8_t unused; + uint8_t ks[CHACHA_BLOCKLEN]; + uint8_t unused; }; static inline void chacha_keysetup(struct chacha_ctx *x, const u_char *k, diff --git a/src/lib/libssl/src/crypto/chacha/chacha-merged.c b/src/lib/libssl/src/crypto/chacha/chacha-merged.c index a665fb316f..557dfd5b56 100644 --- a/src/lib/libssl/src/crypto/chacha/chacha-merged.c +++ b/src/lib/libssl/src/crypto/chacha/chacha-merged.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chacha-merged.c,v 1.6 2014/06/24 18:12:09 jsing Exp $ */ +/* $OpenBSD: chacha-merged.c,v 1.7 2014/07/11 08:47:47 bcook Exp $ */ /* chacha-merged.c version 20080118 D. J. Bernstein @@ -7,6 +7,8 @@ Public domain. #include +#include + #define CHACHA_MINKEYLEN 16 #define CHACHA_NONCELEN 8 #define CHACHA_CTRLEN 8 @@ -15,8 +17,8 @@ Public domain. struct chacha_ctx { u_int input[16]; - u_int8_t ks[CHACHA_BLOCKLEN]; - u_int8_t unused; + uint8_t ks[CHACHA_BLOCKLEN]; + uint8_t unused; }; static inline void chacha_keysetup(struct chacha_ctx *x, const u_char *k, -- cgit v1.2.3-55-g6feb