diff options
author | tb <> | 2024-06-01 07:44:11 +0000 |
---|---|---|
committer | tb <> | 2024-06-01 07:44:11 +0000 |
commit | f1d0891cbe8e9a0eb2a6b78725f11429b2224763 (patch) | |
tree | 3b11886e1986fdd282699df45052115c3b2ff3a5 | |
parent | f3bc6c83f92ef9b23bfc523ef1b24bfa27e1f6e4 (diff) | |
download | openbsd-f1d0891cbe8e9a0eb2a6b78725f11429b2224763.tar.gz openbsd-f1d0891cbe8e9a0eb2a6b78725f11429b2224763.tar.bz2 openbsd-f1d0891cbe8e9a0eb2a6b78725f11429b2224763.zip |
Reverse order of attributes
requested by jsing on review
-rw-r--r-- | src/lib/libcrypto/md4/md4.h | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/md5/md5.h | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/ripemd/ripemd.h | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/sha/sha.h | 18 | ||||
-rw-r--r-- | src/lib/libcrypto/whrlpool/whrlpool.h | 6 |
5 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/libcrypto/md4/md4.h b/src/lib/libcrypto/md4/md4.h index bf4313b345..64bcfefeec 100644 --- a/src/lib/libcrypto/md4/md4.h +++ b/src/lib/libcrypto/md4/md4.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: md4.h,v 1.18 2024/06/01 07:36:16 tb Exp $ */ | 1 | /* $OpenBSD: md4.h,v 1.19 2024/06/01 07:44:11 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -95,8 +95,8 @@ int MD4_Update(MD4_CTX *c, const void *data, size_t len); | |||
95 | __attribute__ ((__bounded__(__buffer__, 2, 3))); | 95 | __attribute__ ((__bounded__(__buffer__, 2, 3))); |
96 | int MD4_Final(unsigned char *md, MD4_CTX *c); | 96 | int MD4_Final(unsigned char *md, MD4_CTX *c); |
97 | unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md); | 97 | unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md); |
98 | __attribute__ ((__nonnull__(3))) | 98 | __attribute__ ((__bounded__(__buffer__, 1, 2))) |
99 | __attribute__ ((__bounded__(__buffer__, 1, 2))); | 99 | __attribute__ ((__nonnull__(3))); |
100 | void MD4_Transform(MD4_CTX *c, const unsigned char *b); | 100 | void MD4_Transform(MD4_CTX *c, const unsigned char *b); |
101 | #ifdef __cplusplus | 101 | #ifdef __cplusplus |
102 | } | 102 | } |
diff --git a/src/lib/libcrypto/md5/md5.h b/src/lib/libcrypto/md5/md5.h index 9191ff2131..a3529f486d 100644 --- a/src/lib/libcrypto/md5/md5.h +++ b/src/lib/libcrypto/md5/md5.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: md5.h,v 1.22 2024/06/01 07:36:16 tb Exp $ */ | 1 | /* $OpenBSD: md5.h,v 1.23 2024/06/01 07:44:11 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -98,8 +98,8 @@ int MD5_Update(MD5_CTX *c, const void *data, size_t len) | |||
98 | __attribute__ ((__bounded__(__buffer__, 2, 3))); | 98 | __attribute__ ((__bounded__(__buffer__, 2, 3))); |
99 | int MD5_Final(unsigned char *md, MD5_CTX *c); | 99 | int MD5_Final(unsigned char *md, MD5_CTX *c); |
100 | unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md) | 100 | unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md) |
101 | __attribute__ ((__nonnull__(3))) | 101 | __attribute__ ((__bounded__(__buffer__, 1, 2))) |
102 | __attribute__ ((__bounded__(__buffer__, 1, 2))); | 102 | __attribute__ ((__nonnull__(3))); |
103 | void MD5_Transform(MD5_CTX *c, const unsigned char *b); | 103 | void MD5_Transform(MD5_CTX *c, const unsigned char *b); |
104 | #ifdef __cplusplus | 104 | #ifdef __cplusplus |
105 | } | 105 | } |
diff --git a/src/lib/libcrypto/ripemd/ripemd.h b/src/lib/libcrypto/ripemd/ripemd.h index 5925083c0c..98fd0f71ec 100644 --- a/src/lib/libcrypto/ripemd/ripemd.h +++ b/src/lib/libcrypto/ripemd/ripemd.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ripemd.h,v 1.16 2024/06/01 07:36:16 tb Exp $ */ | 1 | /* $OpenBSD: ripemd.h,v 1.17 2024/06/01 07:44:11 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -97,8 +97,8 @@ int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, size_t len); | |||
97 | int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c); | 97 | int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c); |
98 | unsigned char *RIPEMD160(const unsigned char *d, size_t n, | 98 | unsigned char *RIPEMD160(const unsigned char *d, size_t n, |
99 | unsigned char *md) | 99 | unsigned char *md) |
100 | __attribute__ ((__nonnull__(3))) | 100 | __attribute__ ((__bounded__(__buffer__, 1, 2))) |
101 | __attribute__ ((__bounded__(__buffer__, 1, 2))); | 101 | __attribute__ ((__nonnull__(3))); |
102 | void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b); | 102 | void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b); |
103 | #ifdef __cplusplus | 103 | #ifdef __cplusplus |
104 | } | 104 | } |
diff --git a/src/lib/libcrypto/sha/sha.h b/src/lib/libcrypto/sha/sha.h index f87203d912..778a9c83ec 100644 --- a/src/lib/libcrypto/sha/sha.h +++ b/src/lib/libcrypto/sha/sha.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sha.h,v 1.23 2024/06/01 07:36:16 tb Exp $ */ | 1 | /* $OpenBSD: sha.h,v 1.24 2024/06/01 07:44:11 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -102,8 +102,8 @@ int SHA1_Update(SHA_CTX *c, const void *data, size_t len) | |||
102 | __attribute__ ((__bounded__(__buffer__, 2, 3))); | 102 | __attribute__ ((__bounded__(__buffer__, 2, 3))); |
103 | int SHA1_Final(unsigned char *md, SHA_CTX *c); | 103 | int SHA1_Final(unsigned char *md, SHA_CTX *c); |
104 | unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md) | 104 | unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md) |
105 | __attribute__ ((__nonnull__(3))) | 105 | __attribute__ ((__bounded__(__buffer__, 1, 2))) |
106 | __attribute__ ((__bounded__(__buffer__, 1, 2))); | 106 | __attribute__ ((__nonnull__(3))); |
107 | void SHA1_Transform(SHA_CTX *c, const unsigned char *data); | 107 | void SHA1_Transform(SHA_CTX *c, const unsigned char *data); |
108 | #endif | 108 | #endif |
109 | 109 | ||
@@ -133,8 +133,8 @@ int SHA256_Update(SHA256_CTX *c, const void *data, size_t len) | |||
133 | __attribute__ ((__bounded__(__buffer__, 2, 3))); | 133 | __attribute__ ((__bounded__(__buffer__, 2, 3))); |
134 | int SHA256_Final(unsigned char *md, SHA256_CTX *c); | 134 | int SHA256_Final(unsigned char *md, SHA256_CTX *c); |
135 | unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md) | 135 | unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md) |
136 | __attribute__ ((__nonnull__(3))) | 136 | __attribute__ ((__bounded__(__buffer__, 1, 2))) |
137 | __attribute__ ((__bounded__(__buffer__, 1, 2))); | 137 | __attribute__ ((__nonnull__(3))); |
138 | void SHA256_Transform(SHA256_CTX *c, const unsigned char *data); | 138 | void SHA256_Transform(SHA256_CTX *c, const unsigned char *data); |
139 | #endif | 139 | #endif |
140 | 140 | ||
@@ -175,15 +175,15 @@ int SHA384_Update(SHA512_CTX *c, const void *data, size_t len) | |||
175 | __attribute__ ((__bounded__(__buffer__, 2, 3))); | 175 | __attribute__ ((__bounded__(__buffer__, 2, 3))); |
176 | int SHA384_Final(unsigned char *md, SHA512_CTX *c); | 176 | int SHA384_Final(unsigned char *md, SHA512_CTX *c); |
177 | unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md) | 177 | unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md) |
178 | __attribute__ ((__nonnull__(3))) | 178 | __attribute__ ((__bounded__(__buffer__, 1, 2))) |
179 | __attribute__ ((__bounded__(__buffer__, 1, 2))); | 179 | __attribute__ ((__nonnull__(3))); |
180 | int SHA512_Init(SHA512_CTX *c); | 180 | int SHA512_Init(SHA512_CTX *c); |
181 | int SHA512_Update(SHA512_CTX *c, const void *data, size_t len) | 181 | int SHA512_Update(SHA512_CTX *c, const void *data, size_t len) |
182 | __attribute__ ((__bounded__(__buffer__, 2, 3))); | 182 | __attribute__ ((__bounded__(__buffer__, 2, 3))); |
183 | int SHA512_Final(unsigned char *md, SHA512_CTX *c); | 183 | int SHA512_Final(unsigned char *md, SHA512_CTX *c); |
184 | unsigned char *SHA512(const unsigned char *d, size_t n, unsigned char *md) | 184 | unsigned char *SHA512(const unsigned char *d, size_t n, unsigned char *md) |
185 | __attribute__ ((__nonnull__(3))) | 185 | __attribute__ ((__bounded__(__buffer__, 1, 2))) |
186 | __attribute__ ((__bounded__(__buffer__, 1, 2))); | 186 | __attribute__ ((__nonnull__(3))); |
187 | void SHA512_Transform(SHA512_CTX *c, const unsigned char *data); | 187 | void SHA512_Transform(SHA512_CTX *c, const unsigned char *data); |
188 | #endif | 188 | #endif |
189 | 189 | ||
diff --git a/src/lib/libcrypto/whrlpool/whrlpool.h b/src/lib/libcrypto/whrlpool/whrlpool.h index 1b4fac1993..1670a81b37 100644 --- a/src/lib/libcrypto/whrlpool/whrlpool.h +++ b/src/lib/libcrypto/whrlpool/whrlpool.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: whrlpool.h,v 1.6 2024/06/01 07:36:17 tb Exp $ */ | 1 | /* $OpenBSD: whrlpool.h,v 1.7 2024/06/01 07:44:11 tb Exp $ */ |
2 | 2 | ||
3 | #include <stddef.h> | 3 | #include <stddef.h> |
4 | 4 | ||
@@ -33,8 +33,8 @@ int WHIRLPOOL_Update (WHIRLPOOL_CTX *c,const void *inp,size_t bytes) | |||
33 | void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c,const void *inp,size_t bits); | 33 | void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c,const void *inp,size_t bits); |
34 | int WHIRLPOOL_Final (unsigned char *md,WHIRLPOOL_CTX *c); | 34 | int WHIRLPOOL_Final (unsigned char *md,WHIRLPOOL_CTX *c); |
35 | unsigned char *WHIRLPOOL(const void *inp,size_t bytes,unsigned char *md) | 35 | unsigned char *WHIRLPOOL(const void *inp,size_t bytes,unsigned char *md) |
36 | __attribute__ ((__nonnull__(3))) | 36 | __attribute__ ((__bounded__(__buffer__, 1, 2))) |
37 | __attribute__ ((__bounded__(__buffer__, 1, 2))); | 37 | __attribute__ ((__nonnull__(3))); |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | #ifdef __cplusplus | 40 | #ifdef __cplusplus |