From fd65fe5ac8856fe4c6fc50ae9a4a4d1f1069489a Mon Sep 17 00:00:00 2001 From: tb Date: Sat, 1 Jun 2024 07:44:11 +0000 Subject: [PATCH] Reverse order of attributes requested by jsing on review --- lib/libcrypto/md4/md4.h | 6 +++--- lib/libcrypto/md5/md5.h | 6 +++--- lib/libcrypto/ripemd/ripemd.h | 6 +++--- lib/libcrypto/sha/sha.h | 18 +++++++++--------- lib/libcrypto/whrlpool/whrlpool.h | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/libcrypto/md4/md4.h b/lib/libcrypto/md4/md4.h index bf4313b345e..64bcfefeec1 100644 --- a/lib/libcrypto/md4/md4.h +++ b/lib/libcrypto/md4/md4.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md4.h,v 1.18 2024/06/01 07:36:16 tb Exp $ */ +/* $OpenBSD: md4.h,v 1.19 2024/06/01 07:44:11 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -95,8 +95,8 @@ int MD4_Update(MD4_CTX *c, const void *data, size_t len); __attribute__ ((__bounded__(__buffer__, 2, 3))); int MD4_Final(unsigned char *md, MD4_CTX *c); unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md); - __attribute__ ((__nonnull__(3))) - __attribute__ ((__bounded__(__buffer__, 1, 2))); + __attribute__ ((__bounded__(__buffer__, 1, 2))) + __attribute__ ((__nonnull__(3))); void MD4_Transform(MD4_CTX *c, const unsigned char *b); #ifdef __cplusplus } diff --git a/lib/libcrypto/md5/md5.h b/lib/libcrypto/md5/md5.h index 9191ff21317..a3529f486d3 100644 --- a/lib/libcrypto/md5/md5.h +++ b/lib/libcrypto/md5/md5.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md5.h,v 1.22 2024/06/01 07:36:16 tb Exp $ */ +/* $OpenBSD: md5.h,v 1.23 2024/06/01 07:44:11 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -98,8 +98,8 @@ int MD5_Update(MD5_CTX *c, const void *data, size_t len) __attribute__ ((__bounded__(__buffer__, 2, 3))); int MD5_Final(unsigned char *md, MD5_CTX *c); unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md) - __attribute__ ((__nonnull__(3))) - __attribute__ ((__bounded__(__buffer__, 1, 2))); + __attribute__ ((__bounded__(__buffer__, 1, 2))) + __attribute__ ((__nonnull__(3))); void MD5_Transform(MD5_CTX *c, const unsigned char *b); #ifdef __cplusplus } diff --git a/lib/libcrypto/ripemd/ripemd.h b/lib/libcrypto/ripemd/ripemd.h index 5925083c0c4..98fd0f71ec6 100644 --- a/lib/libcrypto/ripemd/ripemd.h +++ b/lib/libcrypto/ripemd/ripemd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ripemd.h,v 1.16 2024/06/01 07:36:16 tb Exp $ */ +/* $OpenBSD: ripemd.h,v 1.17 2024/06/01 07:44:11 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -97,8 +97,8 @@ int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, size_t len); int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c); unsigned char *RIPEMD160(const unsigned char *d, size_t n, unsigned char *md) - __attribute__ ((__nonnull__(3))) - __attribute__ ((__bounded__(__buffer__, 1, 2))); + __attribute__ ((__bounded__(__buffer__, 1, 2))) + __attribute__ ((__nonnull__(3))); void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b); #ifdef __cplusplus } diff --git a/lib/libcrypto/sha/sha.h b/lib/libcrypto/sha/sha.h index f87203d912c..778a9c83ecf 100644 --- a/lib/libcrypto/sha/sha.h +++ b/lib/libcrypto/sha/sha.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sha.h,v 1.23 2024/06/01 07:36:16 tb Exp $ */ +/* $OpenBSD: sha.h,v 1.24 2024/06/01 07:44:11 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -102,8 +102,8 @@ int SHA1_Update(SHA_CTX *c, const void *data, size_t len) __attribute__ ((__bounded__(__buffer__, 2, 3))); int SHA1_Final(unsigned char *md, SHA_CTX *c); unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md) - __attribute__ ((__nonnull__(3))) - __attribute__ ((__bounded__(__buffer__, 1, 2))); + __attribute__ ((__bounded__(__buffer__, 1, 2))) + __attribute__ ((__nonnull__(3))); void SHA1_Transform(SHA_CTX *c, const unsigned char *data); #endif @@ -133,8 +133,8 @@ int SHA256_Update(SHA256_CTX *c, const void *data, size_t len) __attribute__ ((__bounded__(__buffer__, 2, 3))); int SHA256_Final(unsigned char *md, SHA256_CTX *c); unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md) - __attribute__ ((__nonnull__(3))) - __attribute__ ((__bounded__(__buffer__, 1, 2))); + __attribute__ ((__bounded__(__buffer__, 1, 2))) + __attribute__ ((__nonnull__(3))); void SHA256_Transform(SHA256_CTX *c, const unsigned char *data); #endif @@ -175,15 +175,15 @@ int SHA384_Update(SHA512_CTX *c, const void *data, size_t len) __attribute__ ((__bounded__(__buffer__, 2, 3))); int SHA384_Final(unsigned char *md, SHA512_CTX *c); unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md) - __attribute__ ((__nonnull__(3))) - __attribute__ ((__bounded__(__buffer__, 1, 2))); + __attribute__ ((__bounded__(__buffer__, 1, 2))) + __attribute__ ((__nonnull__(3))); int SHA512_Init(SHA512_CTX *c); int SHA512_Update(SHA512_CTX *c, const void *data, size_t len) __attribute__ ((__bounded__(__buffer__, 2, 3))); int SHA512_Final(unsigned char *md, SHA512_CTX *c); unsigned char *SHA512(const unsigned char *d, size_t n, unsigned char *md) - __attribute__ ((__nonnull__(3))) - __attribute__ ((__bounded__(__buffer__, 1, 2))); + __attribute__ ((__bounded__(__buffer__, 1, 2))) + __attribute__ ((__nonnull__(3))); void SHA512_Transform(SHA512_CTX *c, const unsigned char *data); #endif diff --git a/lib/libcrypto/whrlpool/whrlpool.h b/lib/libcrypto/whrlpool/whrlpool.h index 1b4fac1993d..1670a81b378 100644 --- a/lib/libcrypto/whrlpool/whrlpool.h +++ b/lib/libcrypto/whrlpool/whrlpool.h @@ -1,4 +1,4 @@ -/* $OpenBSD: whrlpool.h,v 1.6 2024/06/01 07:36:17 tb Exp $ */ +/* $OpenBSD: whrlpool.h,v 1.7 2024/06/01 07:44:11 tb Exp $ */ #include @@ -33,8 +33,8 @@ int WHIRLPOOL_Update (WHIRLPOOL_CTX *c,const void *inp,size_t bytes) void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c,const void *inp,size_t bits); int WHIRLPOOL_Final (unsigned char *md,WHIRLPOOL_CTX *c); unsigned char *WHIRLPOOL(const void *inp,size_t bytes,unsigned char *md) - __attribute__ ((__nonnull__(3))) - __attribute__ ((__bounded__(__buffer__, 1, 2))); + __attribute__ ((__bounded__(__buffer__, 1, 2))) + __attribute__ ((__nonnull__(3))); #endif #ifdef __cplusplus -- 2.20.1