1 files changed, 33 insertions, 36 deletions

diff --git a/src/lib/libcrypto/sha/sha.h b/src/lib/libcrypto/sha/sha.h
index 87fdf8d186..e1de79f4f4 100644
--- a/src/lib/libcrypto/sha/sha.h
+++ b/src/lib/libcrypto/sha/sha.h
@@ -1,25 +1,25 @@
-/* $OpenBSD: sha.h,v 1.21 2015/09/13 21:09:56 doug Exp $ */
+/* $OpenBSD: sha.h,v 1.22 2023/07/08 07:08:11 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -89,21 +89,20 @@ extern "C" {
 #define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
 #define SHA_DIGEST_LENGTH 20
 
-typedef struct SHAstate_st
-        {
-        SHA_LONG h0,h1,h2,h3,h4;
-        SHA_LONG Nl,Nh;
+typedef struct SHAstate_st {
+        SHA_LONG h0, h1, h2, h3, h4;
+        SHA_LONG Nl, Nh;
         SHA_LONG data[SHA_LBLOCK];
         unsigned int num;
-        } SHA_CTX;
+} SHA_CTX;
 
 #ifndef OPENSSL_NO_SHA1
 int SHA1_Init(SHA_CTX *c);
 int SHA1_Update(SHA_CTX *c, const void *data, size_t len)
-        __attribute__ ((__bounded__(__buffer__,2,3)));
+    __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__ ((__bounded__(__buffer__,1,2)));
+    __attribute__ ((__bounded__(__buffer__, 1, 2)));
 void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
 #endif
 
@@ -113,27 +112,26 @@ void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
 #define SHA224_DIGEST_LENGTH    28
 #define SHA256_DIGEST_LENGTH    32
 
-typedef struct SHA256state_st
-        {
+typedef struct SHA256state_st {
         SHA_LONG h[8];
-        SHA_LONG Nl,Nh;
+        SHA_LONG Nl, Nh;
         SHA_LONG data[SHA_LBLOCK];
-        unsigned int num,md_len;
-        } SHA256_CTX;
+        unsigned int num, md_len;
+} SHA256_CTX;
 
 #ifndef OPENSSL_NO_SHA256
 int SHA224_Init(SHA256_CTX *c);
 int SHA224_Update(SHA256_CTX *c, const void *data, size_t len)
-        __attribute__ ((__bounded__(__buffer__,2,3)));
+    __attribute__ ((__bounded__(__buffer__, 2, 3)));
 int SHA224_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA224(const unsigned char *d, size_t n,unsigned char *md)
-        __attribute__ ((__bounded__(__buffer__,1,2)));
+unsigned char *SHA224(const unsigned char *d, size_t n, unsigned char *md)
+    __attribute__ ((__bounded__(__buffer__, 1, 2)));
 int SHA256_Init(SHA256_CTX *c);
 int SHA256_Update(SHA256_CTX *c, const void *data, size_t len)
-        __attribute__ ((__bounded__(__buffer__,2,3)));
+    __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__ ((__bounded__(__buffer__,1,2)));
+unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md)
+    __attribute__ ((__bounded__(__buffer__, 1, 2)));
 void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
 #endif
 
@@ -157,31 +155,30 @@ void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
 #define U64(C)     C##ULL
 #endif
 
-typedef struct SHA512state_st
-        {
+typedef struct SHA512state_st {
         SHA_LONG64 h[8];
-        SHA_LONG64 Nl,Nh;
+        SHA_LONG64 Nl, Nh;
         union {
                 SHA_LONG64      d[SHA_LBLOCK];
                 unsigned char   p[SHA512_CBLOCK];
         } u;
-        unsigned int num,md_len;
-        } SHA512_CTX;
+        unsigned int num, md_len;
+} SHA512_CTX;
 #endif
 
 #ifndef OPENSSL_NO_SHA512
 int SHA384_Init(SHA512_CTX *c);
 int SHA384_Update(SHA512_CTX *c, const void *data, size_t len)
-        __attribute__ ((__bounded__(__buffer__,2,3)));
+    __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__ ((__bounded__(__buffer__,1,2)));
+unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md)
+    __attribute__ ((__bounded__(__buffer__, 1, 2)));
 int SHA512_Init(SHA512_CTX *c);
 int SHA512_Update(SHA512_CTX *c, const void *data, size_t len)
-        __attribute__ ((__bounded__(__buffer__,2,3)));
+    __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__ ((__bounded__(__buffer__,1,2)));
+unsigned char *SHA512(const unsigned char *d, size_t n, unsigned char *md)
+    __attribute__ ((__bounded__(__buffer__, 1, 2)));
 void SHA512_Transform(SHA512_CTX *c, const unsigned char *data);
 #endif