diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-06 12:28:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-04-06 12:28:38 (GMT) |
| commit | 80abb2fdb55f3ad8128faf296924516d4956324a (patch) | |
| tree | 508d276b5d6437e3801f5178630bf5ad57267b0c | |
| parent | 63996cca048040e4f6733cbfe8af730e38de97f2 (diff) | |
| parent | a9fc751e65a222e32b8e3ae36af363adf82def35 (diff) | |
| download | CMake-80abb2fdb55f3ad8128faf296924516d4956324a.zip CMake-80abb2fdb55f3ad8128faf296924516d4956324a.tar.gz CMake-80abb2fdb55f3ad8128faf296924516d4956324a.tar.bz2 | |
Merge branch 'libarchive-u_char' into release-3.19
Merge-request: !5981
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_random.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c index 65ea691..9d1aa49 100644 --- a/Utilities/cmlibarchive/libarchive/archive_random.c +++ b/Utilities/cmlibarchive/libarchive/archive_random.c @@ -173,7 +173,7 @@ arc4_init(void) } static inline void -arc4_addrandom(u_char *dat, int datlen) +arc4_addrandom(uint8_t *dat, int datlen) { int n; uint8_t si; @@ -196,7 +196,7 @@ arc4_stir(void) struct { struct timeval tv; pid_t pid; - u_char rnd[KEYSIZE]; + uint8_t rnd[KEYSIZE]; } rdat; if (!rs_initialized) { @@ -216,7 +216,7 @@ arc4_stir(void) /* We'll just take whatever was on the stack too... */ } - arc4_addrandom((u_char *)&rdat, KEYSIZE); + arc4_addrandom((uint8_t *)&rdat, KEYSIZE); /* * Discard early keystream, as per recommendations in: @@ -258,7 +258,7 @@ arc4_getbyte(void) static void arc4random_buf(void *_buf, size_t n) { - u_char *buf = (u_char *)_buf; + uint8_t *buf = (uint8_t *)_buf; _ARC4_LOCK(); arc4_stir_if_needed(); while (n--) { |