diff options
| author | tb <> | 2024-06-05 19:43:06 +0000 |
|---|---|---|
| committer | tb <> | 2024-06-05 19:43:06 +0000 |
| commit | c42d1dfb3a73c033740c77876c3da35f1868ec0d (patch) | |
| tree | f2b55d2896014d50bed3fbbdbf472dbfbde6b649 /src | |
| parent | 18dd86b918a0f25a03d08efbc568435be2de3d84 (diff) | |
| download | openbsd-c42d1dfb3a73c033740c77876c3da35f1868ec0d.tar.gz openbsd-c42d1dfb3a73c033740c77876c3da35f1868ec0d.tar.bz2 openbsd-c42d1dfb3a73c033740c77876c3da35f1868ec0d.zip | |
Revert __bounded__ hack in chacha-merged.c
Thanks to Viktor Szakats for figuring out that stdint.h was missing
in the portable tarballs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/chacha/chacha-merged.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libcrypto/chacha/chacha-merged.c b/src/lib/libcrypto/chacha/chacha-merged.c index 3e17b9354b..debb776c8f 100644 --- a/src/lib/libcrypto/chacha/chacha-merged.c +++ b/src/lib/libcrypto/chacha/chacha-merged.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: chacha-merged.c,v 1.12 2024/06/01 17:56:44 tb Exp $ */ | 1 | /* $OpenBSD: chacha-merged.c,v 1.13 2024/06/05 19:43:06 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | chacha-merged.c version 20080118 | 3 | chacha-merged.c version 20080118 |
| 4 | D. J. Bernstein | 4 | D. J. Bernstein |
| @@ -7,10 +7,6 @@ Public domain. | |||
| 7 | 7 | ||
| 8 | #include <stdint.h> | 8 | #include <stdint.h> |
| 9 | 9 | ||
| 10 | #if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__) | ||
| 11 | #define __bounded__(x, y, z) | ||
| 12 | #endif | ||
| 13 | |||
| 14 | #define CHACHA_MINKEYLEN 16 | 10 | #define CHACHA_MINKEYLEN 16 |
| 15 | #define CHACHA_NONCELEN 8 | 11 | #define CHACHA_NONCELEN 8 |
| 16 | #define CHACHA_CTRLEN 8 | 12 | #define CHACHA_CTRLEN 8 |
