4 files changed, 293 insertions, 249 deletions
diff --git a/src/lib/libcrypto/ripemd/ripemd.h b/src/lib/libcrypto/ripemd/ripemd.h
index a5f3a12937..03ba781c4f 100644
--- a/src/lib/libcrypto/ripemd/ripemd.h
+++ b/src/lib/libcrypto/ripemd/ripemd.h
@@ -1,25 +1,25 @@
-/* $OpenBSD: ripemd.h,v 1.14 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: ripemd.h,v 1.15 2023/07/08 06:52:56 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
@@ -84,19 +84,18 @@ extern "C" {
 #define RIPEMD160_LBLOCK        (RIPEMD160_CBLOCK/4)
 #define RIPEMD160_DIGEST_LENGTH 20
-typedef struct RIPEMD160state_st
+typedef struct RIPEMD160state_st {
-        {
+        RIPEMD160_LONG A, B,C, D, E;
-        RIPEMD160_LONG A,B,C,D,E;
+        RIPEMD160_LONG Nl, Nh;
-        RIPEMD160_LONG Nl,Nh;
        RIPEMD160_LONG data[RIPEMD160_LBLOCK];
        unsigned int   num;
-        } RIPEMD160_CTX;
+} RIPEMD160_CTX;
 int RIPEMD160_Init(RIPEMD160_CTX *c);
 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);
+    unsigned char *md);
 void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b);
 #ifdef  __cplusplus
 }
diff --git a/src/lib/libcrypto/ripemd/rmd_dgst.c b/src/lib/libcrypto/ripemd/rmd_dgst.c
index 9ba11edeb6..0b441d5ccb 100644
--- a/src/lib/libcrypto/ripemd/rmd_dgst.c
+++ b/src/lib/libcrypto/ripemd/rmd_dgst.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: rmd_dgst.c,v 1.19 2023/07/08 06:43:39 jsing Exp $ */
+/* $OpenBSD: rmd_dgst.c,v 1.20 2023/07/08 06:52:56 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
@@ -78,7 +78,7 @@
 __BEGIN_HIDDEN_DECLS
-void ripemd160_block_data_order (RIPEMD160_CTX *c, const void *p,size_t num);
+void ripemd160_block_data_order (RIPEMD160_CTX *c, const void *p, size_t num);
 __END_HIDDEN_DECLS
@@ -153,229 +153,272 @@ __END_HIDDEN_DECLS
        c=ROTATE(c,10); }
 #  ifdef RMD160_ASM
-     void ripemd160_block_x86(RIPEMD160_CTX *c, unsigned long *p,size_t num);
+void ripemd160_block_x86(RIPEMD160_CTX *c, unsigned long *p, size_t num);
 #    define ripemd160_block ripemd160_block_x86
 #  else
-     void ripemd160_block(RIPEMD160_CTX *c, unsigned long *p,size_t num);
+void ripemd160_block(RIPEMD160_CTX *c, unsigned long *p, size_t num);
 #  endif
-int RIPEMD160_Init(RIPEMD160_CTX *c)
+int
-        {
+RIPEMD160_Init(RIPEMD160_CTX *c)
-        memset (c,0,sizeof(*c));
+{
-        c->A=RIPEMD160_A;
+        memset (c, 0, sizeof(*c));
-        c->B=RIPEMD160_B;
+        c->A = RIPEMD160_A;
-        c->C=RIPEMD160_C;
+        c->B = RIPEMD160_B;
-        c->D=RIPEMD160_D;
+        c->C = RIPEMD160_C;
-        c->E=RIPEMD160_E;
+        c->D = RIPEMD160_D;
+        c->E = RIPEMD160_E;
        return 1;
-        }
+}
 #ifndef ripemd160_block_data_order
 #ifdef X
 #undef X
 #endif
-void ripemd160_block_data_order (RIPEMD160_CTX *ctx, const void *p, size_t num)
+void
-        {
+ripemd160_block_data_order(RIPEMD160_CTX *ctx, const void *p, size_t num)
-        const unsigned char *data=p;
+{
-        unsigned MD32_REG_T A,B,C,D,E;
+        const unsigned char *data = p;
-        unsigned MD32_REG_T a,b,c,d,e,l;
+        unsigned MD32_REG_T A, B,C, D, E;
+        unsigned MD32_REG_T a, b,c, d,e, l;
 #ifndef MD32_XARRAY
        /* See comment in crypto/sha/sha_locl.h for details. */
        unsigned MD32_REG_T     XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
-                                XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15;
+            XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
 # define X(i)   XX##i
 #else
        RIPEMD160_LONG  XX[16];
 # define X(i)   XX[i]
 #endif
-        for (;num--;)
+        for (; num--; ) {
-                {
+                A = ctx->A;
-        A=ctx->A; B=ctx->B; C=ctx->C; D=ctx->D; E=ctx->E;
+                B = ctx->B;
+                C = ctx->C;
-        HOST_c2l(data,l); X( 0)=l;HOST_c2l(data,l); X( 1)=l;
+                D = ctx->D;
-        RIP1(A,B,C,D,E,WL00,SL00);      HOST_c2l(data,l); X( 2)=l;
+                E = ctx->E;
-        RIP1(E,A,B,C,D,WL01,SL01);      HOST_c2l(data,l); X( 3)=l;
-        RIP1(D,E,A,B,C,WL02,SL02);      HOST_c2l(data,l); X( 4)=l;
+                HOST_c2l(data, l);
-        RIP1(C,D,E,A,B,WL03,SL03);      HOST_c2l(data,l); X( 5)=l;
+                X( 0) = l;HOST_c2l(data, l);
-        RIP1(B,C,D,E,A,WL04,SL04);      HOST_c2l(data,l); X( 6)=l;
+                X( 1) = l;
-        RIP1(A,B,C,D,E,WL05,SL05);      HOST_c2l(data,l); X( 7)=l;
+                RIP1(A, B,C, D,E, WL00, SL00);
-        RIP1(E,A,B,C,D,WL06,SL06);      HOST_c2l(data,l); X( 8)=l;
+                HOST_c2l(data, l);
-        RIP1(D,E,A,B,C,WL07,SL07);      HOST_c2l(data,l); X( 9)=l;
+                X( 2) = l;
-        RIP1(C,D,E,A,B,WL08,SL08);      HOST_c2l(data,l); X(10)=l;
+                RIP1(E, A,B, C,D, WL01, SL01);
-        RIP1(B,C,D,E,A,WL09,SL09);      HOST_c2l(data,l); X(11)=l;
+                HOST_c2l(data, l);
-        RIP1(A,B,C,D,E,WL10,SL10);      HOST_c2l(data,l); X(12)=l;
+                X( 3) = l;
-        RIP1(E,A,B,C,D,WL11,SL11);      HOST_c2l(data,l); X(13)=l;
+                RIP1(D, E,A, B,C, WL02, SL02);
-        RIP1(D,E,A,B,C,WL12,SL12);      HOST_c2l(data,l); X(14)=l;
+                HOST_c2l(data, l);
-        RIP1(C,D,E,A,B,WL13,SL13);      HOST_c2l(data,l); X(15)=l;
+                X( 4) = l;
-        RIP1(B,C,D,E,A,WL14,SL14);
+                RIP1(C, D,E, A,B, WL03, SL03);
-        RIP1(A,B,C,D,E,WL15,SL15);
+                HOST_c2l(data, l);
+                X( 5) = l;
-        RIP2(E,A,B,C,D,WL16,SL16,KL1);
+                RIP1(B, C,D, E,A, WL04, SL04);
-        RIP2(D,E,A,B,C,WL17,SL17,KL1);
+                HOST_c2l(data, l);
-        RIP2(C,D,E,A,B,WL18,SL18,KL1);
+                X( 6) = l;
-        RIP2(B,C,D,E,A,WL19,SL19,KL1);
+                RIP1(A, B,C, D,E, WL05, SL05);
-        RIP2(A,B,C,D,E,WL20,SL20,KL1);
+                HOST_c2l(data, l);
-        RIP2(E,A,B,C,D,WL21,SL21,KL1);
+                X( 7) = l;
-        RIP2(D,E,A,B,C,WL22,SL22,KL1);
+                RIP1(E, A,B, C,D, WL06, SL06);
-        RIP2(C,D,E,A,B,WL23,SL23,KL1);
+                HOST_c2l(data, l);
-        RIP2(B,C,D,E,A,WL24,SL24,KL1);
+                X( 8) = l;
-        RIP2(A,B,C,D,E,WL25,SL25,KL1);
+                RIP1(D, E,A, B,C, WL07, SL07);
-        RIP2(E,A,B,C,D,WL26,SL26,KL1);
+                HOST_c2l(data, l);
-        RIP2(D,E,A,B,C,WL27,SL27,KL1);
+                X( 9) = l;
-        RIP2(C,D,E,A,B,WL28,SL28,KL1);
+                RIP1(C, D,E, A,B, WL08, SL08);
-        RIP2(B,C,D,E,A,WL29,SL29,KL1);
+                HOST_c2l(data, l);
-        RIP2(A,B,C,D,E,WL30,SL30,KL1);
+                X(10) = l;
-        RIP2(E,A,B,C,D,WL31,SL31,KL1);
+                RIP1(B, C,D, E,A, WL09, SL09);
+                HOST_c2l(data, l);
-        RIP3(D,E,A,B,C,WL32,SL32,KL2);
+                X(11) = l;
-        RIP3(C,D,E,A,B,WL33,SL33,KL2);
+                RIP1(A, B,C, D,E, WL10, SL10);
-        RIP3(B,C,D,E,A,WL34,SL34,KL2);
+                HOST_c2l(data, l);
-        RIP3(A,B,C,D,E,WL35,SL35,KL2);
+                X(12) = l;
-        RIP3(E,A,B,C,D,WL36,SL36,KL2);
+                RIP1(E, A,B, C,D, WL11, SL11);
-        RIP3(D,E,A,B,C,WL37,SL37,KL2);
+                HOST_c2l(data, l);
-        RIP3(C,D,E,A,B,WL38,SL38,KL2);
+                X(13) = l;
-        RIP3(B,C,D,E,A,WL39,SL39,KL2);
+                RIP1(D, E,A, B,C, WL12, SL12);
-        RIP3(A,B,C,D,E,WL40,SL40,KL2);
+                HOST_c2l(data, l);
-        RIP3(E,A,B,C,D,WL41,SL41,KL2);
+                X(14) = l;
-        RIP3(D,E,A,B,C,WL42,SL42,KL2);
+                RIP1(C, D,E, A,B, WL13, SL13);
-        RIP3(C,D,E,A,B,WL43,SL43,KL2);
+                HOST_c2l(data, l);
-        RIP3(B,C,D,E,A,WL44,SL44,KL2);
+                X(15) = l;
-        RIP3(A,B,C,D,E,WL45,SL45,KL2);
+                RIP1(B, C,D, E,A, WL14, SL14);
-        RIP3(E,A,B,C,D,WL46,SL46,KL2);
+                RIP1(A, B,C, D,E, WL15, SL15);
-        RIP3(D,E,A,B,C,WL47,SL47,KL2);
+                RIP2(E, A,B, C,D, WL16, SL16, KL1);
-        RIP4(C,D,E,A,B,WL48,SL48,KL3);
+                RIP2(D, E,A, B,C, WL17, SL17, KL1);
-        RIP4(B,C,D,E,A,WL49,SL49,KL3);
+                RIP2(C, D,E, A,B, WL18, SL18, KL1);
-        RIP4(A,B,C,D,E,WL50,SL50,KL3);
+                RIP2(B, C,D, E,A, WL19, SL19, KL1);
-        RIP4(E,A,B,C,D,WL51,SL51,KL3);
+                RIP2(A, B,C, D,E, WL20, SL20, KL1);
-        RIP4(D,E,A,B,C,WL52,SL52,KL3);
+                RIP2(E, A,B, C,D, WL21, SL21, KL1);
-        RIP4(C,D,E,A,B,WL53,SL53,KL3);
+                RIP2(D, E,A, B,C, WL22, SL22, KL1);
-        RIP4(B,C,D,E,A,WL54,SL54,KL3);
+                RIP2(C, D,E, A,B, WL23, SL23, KL1);
-        RIP4(A,B,C,D,E,WL55,SL55,KL3);
+                RIP2(B, C,D, E,A, WL24, SL24, KL1);
-        RIP4(E,A,B,C,D,WL56,SL56,KL3);
+                RIP2(A, B,C, D,E, WL25, SL25, KL1);
-        RIP4(D,E,A,B,C,WL57,SL57,KL3);
+                RIP2(E, A,B, C,D, WL26, SL26, KL1);
-        RIP4(C,D,E,A,B,WL58,SL58,KL3);
+                RIP2(D, E,A, B,C, WL27, SL27, KL1);
-        RIP4(B,C,D,E,A,WL59,SL59,KL3);
+                RIP2(C, D,E, A,B, WL28, SL28, KL1);
-        RIP4(A,B,C,D,E,WL60,SL60,KL3);
+                RIP2(B, C,D, E,A, WL29, SL29, KL1);
-        RIP4(E,A,B,C,D,WL61,SL61,KL3);
+                RIP2(A, B,C, D,E, WL30, SL30, KL1);
-        RIP4(D,E,A,B,C,WL62,SL62,KL3);
+                RIP2(E, A,B, C,D, WL31, SL31, KL1);
-        RIP4(C,D,E,A,B,WL63,SL63,KL3);
+                RIP3(D, E,A, B,C, WL32, SL32, KL2);
-        RIP5(B,C,D,E,A,WL64,SL64,KL4);
+                RIP3(C, D,E, A,B, WL33, SL33, KL2);
-        RIP5(A,B,C,D,E,WL65,SL65,KL4);
+                RIP3(B, C,D, E,A, WL34, SL34, KL2);
-        RIP5(E,A,B,C,D,WL66,SL66,KL4);
+                RIP3(A, B,C, D,E, WL35, SL35, KL2);
-        RIP5(D,E,A,B,C,WL67,SL67,KL4);
+                RIP3(E, A,B, C,D, WL36, SL36, KL2);
-        RIP5(C,D,E,A,B,WL68,SL68,KL4);
+                RIP3(D, E,A, B,C, WL37, SL37, KL2);
-        RIP5(B,C,D,E,A,WL69,SL69,KL4);
+                RIP3(C, D,E, A,B, WL38, SL38, KL2);
-        RIP5(A,B,C,D,E,WL70,SL70,KL4);
+                RIP3(B, C,D, E,A, WL39, SL39, KL2);
-        RIP5(E,A,B,C,D,WL71,SL71,KL4);
+                RIP3(A, B,C, D,E, WL40, SL40, KL2);
-        RIP5(D,E,A,B,C,WL72,SL72,KL4);
+                RIP3(E, A,B, C,D, WL41, SL41, KL2);
-        RIP5(C,D,E,A,B,WL73,SL73,KL4);
+                RIP3(D, E,A, B,C, WL42, SL42, KL2);
-        RIP5(B,C,D,E,A,WL74,SL74,KL4);
+                RIP3(C, D,E, A,B, WL43, SL43, KL2);
-        RIP5(A,B,C,D,E,WL75,SL75,KL4);
+                RIP3(B, C,D, E,A, WL44, SL44, KL2);
-        RIP5(E,A,B,C,D,WL76,SL76,KL4);
+                RIP3(A, B,C, D,E, WL45, SL45, KL2);
-        RIP5(D,E,A,B,C,WL77,SL77,KL4);
+                RIP3(E, A,B, C,D, WL46, SL46, KL2);
-        RIP5(C,D,E,A,B,WL78,SL78,KL4);
+                RIP3(D, E,A, B,C, WL47, SL47, KL2);
-        RIP5(B,C,D,E,A,WL79,SL79,KL4);
+                RIP4(C, D,E, A,B, WL48, SL48, KL3);
-        a=A; b=B; c=C; d=D; e=E;
+                RIP4(B, C,D, E,A, WL49, SL49, KL3);
-        /* Do other half */
+                RIP4(A, B,C, D,E, WL50, SL50, KL3);
-        A=ctx->A; B=ctx->B; C=ctx->C; D=ctx->D; E=ctx->E;
+                RIP4(E, A,B, C,D, WL51, SL51, KL3);
+                RIP4(D, E,A, B,C, WL52, SL52, KL3);
-        RIP5(A,B,C,D,E,WR00,SR00,KR0);
+                RIP4(C, D,E, A,B, WL53, SL53, KL3);
-        RIP5(E,A,B,C,D,WR01,SR01,KR0);
+                RIP4(B, C,D, E,A, WL54, SL54, KL3);
-        RIP5(D,E,A,B,C,WR02,SR02,KR0);
+                RIP4(A, B,C, D,E, WL55, SL55, KL3);
-        RIP5(C,D,E,A,B,WR03,SR03,KR0);
+                RIP4(E, A,B, C,D, WL56, SL56, KL3);
-        RIP5(B,C,D,E,A,WR04,SR04,KR0);
+                RIP4(D, E,A, B,C, WL57, SL57, KL3);
-        RIP5(A,B,C,D,E,WR05,SR05,KR0);
+                RIP4(C, D,E, A,B, WL58, SL58, KL3);
-        RIP5(E,A,B,C,D,WR06,SR06,KR0);
+                RIP4(B, C,D, E,A, WL59, SL59, KL3);
-        RIP5(D,E,A,B,C,WR07,SR07,KR0);
+                RIP4(A, B,C, D,E, WL60, SL60, KL3);
-        RIP5(C,D,E,A,B,WR08,SR08,KR0);
+                RIP4(E, A,B, C,D, WL61, SL61, KL3);
-        RIP5(B,C,D,E,A,WR09,SR09,KR0);
+                RIP4(D, E,A, B,C, WL62, SL62, KL3);
-        RIP5(A,B,C,D,E,WR10,SR10,KR0);
+                RIP4(C, D,E, A,B, WL63, SL63, KL3);
-        RIP5(E,A,B,C,D,WR11,SR11,KR0);
-        RIP5(D,E,A,B,C,WR12,SR12,KR0);
+                RIP5(B, C,D, E,A, WL64, SL64, KL4);
-        RIP5(C,D,E,A,B,WR13,SR13,KR0);
+                RIP5(A, B,C, D,E, WL65, SL65, KL4);
-        RIP5(B,C,D,E,A,WR14,SR14,KR0);
+                RIP5(E, A,B, C,D, WL66, SL66, KL4);
-        RIP5(A,B,C,D,E,WR15,SR15,KR0);
+                RIP5(D, E,A, B,C, WL67, SL67, KL4);
+                RIP5(C, D,E, A,B, WL68, SL68, KL4);
-        RIP4(E,A,B,C,D,WR16,SR16,KR1);
+                RIP5(B, C,D, E,A, WL69, SL69, KL4);
-        RIP4(D,E,A,B,C,WR17,SR17,KR1);
+                RIP5(A, B,C, D,E, WL70, SL70, KL4);
-        RIP4(C,D,E,A,B,WR18,SR18,KR1);
+                RIP5(E, A,B, C,D, WL71, SL71, KL4);
-        RIP4(B,C,D,E,A,WR19,SR19,KR1);
+                RIP5(D, E,A, B,C, WL72, SL72, KL4);
-        RIP4(A,B,C,D,E,WR20,SR20,KR1);
+                RIP5(C, D,E, A,B, WL73, SL73, KL4);
-        RIP4(E,A,B,C,D,WR21,SR21,KR1);
+                RIP5(B, C,D, E,A, WL74, SL74, KL4);
-        RIP4(D,E,A,B,C,WR22,SR22,KR1);
+                RIP5(A, B,C, D,E, WL75, SL75, KL4);
-        RIP4(C,D,E,A,B,WR23,SR23,KR1);
+                RIP5(E, A,B, C,D, WL76, SL76, KL4);
-        RIP4(B,C,D,E,A,WR24,SR24,KR1);
+                RIP5(D, E,A, B,C, WL77, SL77, KL4);
-        RIP4(A,B,C,D,E,WR25,SR25,KR1);
+                RIP5(C, D,E, A,B, WL78, SL78, KL4);
-        RIP4(E,A,B,C,D,WR26,SR26,KR1);
+                RIP5(B, C,D, E,A, WL79, SL79, KL4);
-        RIP4(D,E,A,B,C,WR27,SR27,KR1);
-        RIP4(C,D,E,A,B,WR28,SR28,KR1);
+                a = A;
-        RIP4(B,C,D,E,A,WR29,SR29,KR1);
+                b = B;
-        RIP4(A,B,C,D,E,WR30,SR30,KR1);
+                c = C;
-        RIP4(E,A,B,C,D,WR31,SR31,KR1);
+                d = D;
+                e = E;
-        RIP3(D,E,A,B,C,WR32,SR32,KR2);
+                /* Do other half */
-        RIP3(C,D,E,A,B,WR33,SR33,KR2);
+                A = ctx->A;
-        RIP3(B,C,D,E,A,WR34,SR34,KR2);
+                B = ctx->B;
-        RIP3(A,B,C,D,E,WR35,SR35,KR2);
+                C = ctx->C;
-        RIP3(E,A,B,C,D,WR36,SR36,KR2);
+                D = ctx->D;
-        RIP3(D,E,A,B,C,WR37,SR37,KR2);
+                E = ctx->E;
-        RIP3(C,D,E,A,B,WR38,SR38,KR2);
-        RIP3(B,C,D,E,A,WR39,SR39,KR2);
+                RIP5(A, B,C, D,E, WR00, SR00, KR0);
-        RIP3(A,B,C,D,E,WR40,SR40,KR2);
+                RIP5(E, A,B, C,D, WR01, SR01, KR0);
-        RIP3(E,A,B,C,D,WR41,SR41,KR2);
+                RIP5(D, E,A, B,C, WR02, SR02, KR0);
-        RIP3(D,E,A,B,C,WR42,SR42,KR2);
+                RIP5(C, D,E, A,B, WR03, SR03, KR0);
-        RIP3(C,D,E,A,B,WR43,SR43,KR2);
+                RIP5(B, C,D, E,A, WR04, SR04, KR0);
-        RIP3(B,C,D,E,A,WR44,SR44,KR2);
+                RIP5(A, B,C, D,E, WR05, SR05, KR0);
-        RIP3(A,B,C,D,E,WR45,SR45,KR2);
+                RIP5(E, A,B, C,D, WR06, SR06, KR0);
-        RIP3(E,A,B,C,D,WR46,SR46,KR2);
+                RIP5(D, E,A, B,C, WR07, SR07, KR0);
-        RIP3(D,E,A,B,C,WR47,SR47,KR2);
+                RIP5(C, D,E, A,B, WR08, SR08, KR0);
+                RIP5(B, C,D, E,A, WR09, SR09, KR0);
-        RIP2(C,D,E,A,B,WR48,SR48,KR3);
+                RIP5(A, B,C, D,E, WR10, SR10, KR0);
-        RIP2(B,C,D,E,A,WR49,SR49,KR3);
+                RIP5(E, A,B, C,D, WR11, SR11, KR0);
-        RIP2(A,B,C,D,E,WR50,SR50,KR3);
+                RIP5(D, E,A, B,C, WR12, SR12, KR0);
-        RIP2(E,A,B,C,D,WR51,SR51,KR3);
+                RIP5(C, D,E, A,B, WR13, SR13, KR0);
-        RIP2(D,E,A,B,C,WR52,SR52,KR3);
+                RIP5(B, C,D, E,A, WR14, SR14, KR0);
-        RIP2(C,D,E,A,B,WR53,SR53,KR3);
+                RIP5(A, B,C, D,E, WR15, SR15, KR0);
-        RIP2(B,C,D,E,A,WR54,SR54,KR3);
-        RIP2(A,B,C,D,E,WR55,SR55,KR3);
+                RIP4(E, A,B, C,D, WR16, SR16, KR1);
-        RIP2(E,A,B,C,D,WR56,SR56,KR3);
+                RIP4(D, E,A, B,C, WR17, SR17, KR1);
-        RIP2(D,E,A,B,C,WR57,SR57,KR3);
+                RIP4(C, D,E, A,B, WR18, SR18, KR1);
-        RIP2(C,D,E,A,B,WR58,SR58,KR3);
+                RIP4(B, C,D, E,A, WR19, SR19, KR1);
-        RIP2(B,C,D,E,A,WR59,SR59,KR3);
+                RIP4(A, B,C, D,E, WR20, SR20, KR1);
-        RIP2(A,B,C,D,E,WR60,SR60,KR3);
+                RIP4(E, A,B, C,D, WR21, SR21, KR1);
-        RIP2(E,A,B,C,D,WR61,SR61,KR3);
+                RIP4(D, E,A, B,C, WR22, SR22, KR1);
-        RIP2(D,E,A,B,C,WR62,SR62,KR3);
+                RIP4(C, D,E, A,B, WR23, SR23, KR1);
-        RIP2(C,D,E,A,B,WR63,SR63,KR3);
+                RIP4(B, C,D, E,A, WR24, SR24, KR1);
+                RIP4(A, B,C, D,E, WR25, SR25, KR1);
-        RIP1(B,C,D,E,A,WR64,SR64);
+                RIP4(E, A,B, C,D, WR26, SR26, KR1);
-        RIP1(A,B,C,D,E,WR65,SR65);
+                RIP4(D, E,A, B,C, WR27, SR27, KR1);
-        RIP1(E,A,B,C,D,WR66,SR66);
+                RIP4(C, D,E, A,B, WR28, SR28, KR1);
-        RIP1(D,E,A,B,C,WR67,SR67);
+                RIP4(B, C,D, E,A, WR29, SR29, KR1);
-        RIP1(C,D,E,A,B,WR68,SR68);
+                RIP4(A, B,C, D,E, WR30, SR30, KR1);
-        RIP1(B,C,D,E,A,WR69,SR69);
+                RIP4(E, A,B, C,D, WR31, SR31, KR1);
-        RIP1(A,B,C,D,E,WR70,SR70);
-        RIP1(E,A,B,C,D,WR71,SR71);
+                RIP3(D, E,A, B,C, WR32, SR32, KR2);
-        RIP1(D,E,A,B,C,WR72,SR72);
+                RIP3(C, D,E, A,B, WR33, SR33, KR2);
-        RIP1(C,D,E,A,B,WR73,SR73);
+                RIP3(B, C,D, E,A, WR34, SR34, KR2);
-        RIP1(B,C,D,E,A,WR74,SR74);
+                RIP3(A, B,C, D,E, WR35, SR35, KR2);
-        RIP1(A,B,C,D,E,WR75,SR75);
+                RIP3(E, A,B, C,D, WR36, SR36, KR2);
-        RIP1(E,A,B,C,D,WR76,SR76);
+                RIP3(D, E,A, B,C, WR37, SR37, KR2);
-        RIP1(D,E,A,B,C,WR77,SR77);
+                RIP3(C, D,E, A,B, WR38, SR38, KR2);
-        RIP1(C,D,E,A,B,WR78,SR78);
+                RIP3(B, C,D, E,A, WR39, SR39, KR2);
-        RIP1(B,C,D,E,A,WR79,SR79);
+                RIP3(A, B,C, D,E, WR40, SR40, KR2);
+                RIP3(E, A,B, C,D, WR41, SR41, KR2);
-        D     =ctx->B+c+D;
+                RIP3(D, E,A, B,C, WR42, SR42, KR2);
-        ctx->B=ctx->C+d+E;
+                RIP3(C, D,E, A,B, WR43, SR43, KR2);
-        ctx->C=ctx->D+e+A;
+                RIP3(B, C,D, E,A, WR44, SR44, KR2);
-        ctx->D=ctx->E+a+B;
+                RIP3(A, B,C, D,E, WR45, SR45, KR2);
-        ctx->E=ctx->A+b+C;
+                RIP3(E, A,B, C,D, WR46, SR46, KR2);
-        ctx->A=D;
+                RIP3(D, E,A, B,C, WR47, SR47, KR2);
-                }
+                RIP2(C, D,E, A,B, WR48, SR48, KR3);
+                RIP2(B, C,D, E,A, WR49, SR49, KR3);
+                RIP2(A, B,C, D,E, WR50, SR50, KR3);
+                RIP2(E, A,B, C,D, WR51, SR51, KR3);
+                RIP2(D, E,A, B,C, WR52, SR52, KR3);
+                RIP2(C, D,E, A,B, WR53, SR53, KR3);
+                RIP2(B, C,D, E,A, WR54, SR54, KR3);
+                RIP2(A, B,C, D,E, WR55, SR55, KR3);
+                RIP2(E, A,B, C,D, WR56, SR56, KR3);
+                RIP2(D, E,A, B,C, WR57, SR57, KR3);
+                RIP2(C, D,E, A,B, WR58, SR58, KR3);
+                RIP2(B, C,D, E,A, WR59, SR59, KR3);
+                RIP2(A, B,C, D,E, WR60, SR60, KR3);
+                RIP2(E, A,B, C,D, WR61, SR61, KR3);
+                RIP2(D, E,A, B,C, WR62, SR62, KR3);
+                RIP2(C, D,E, A,B, WR63, SR63, KR3);
+                RIP1(B, C,D, E,A, WR64, SR64);
+                RIP1(A, B,C, D,E, WR65, SR65);
+                RIP1(E, A,B, C,D, WR66, SR66);
+                RIP1(D, E,A, B,C, WR67, SR67);
+                RIP1(C, D,E, A,B, WR68, SR68);
+                RIP1(B, C,D, E,A, WR69, SR69);
+                RIP1(A, B,C, D,E, WR70, SR70);
+                RIP1(E, A,B, C,D, WR71, SR71);
+                RIP1(D, E,A, B,C, WR72, SR72);
+                RIP1(C, D,E, A,B, WR73, SR73);
+                RIP1(B, C,D, E,A, WR74, SR74);
+                RIP1(A, B,C, D,E, WR75, SR75);
+                RIP1(E, A,B, C,D, WR76, SR76);
+                RIP1(D, E,A, B,C, WR77, SR77);
+                RIP1(C, D,E, A,B, WR78, SR78);
+                RIP1(B, C,D, E,A, WR79, SR79);
+                D = ctx->B + c + D;
+                ctx->B = ctx->C + d + E;
+                ctx->C = ctx->D + e + A;
+                ctx->D = ctx->E + a + B;
+                ctx->E = ctx->A + b + C;
+                ctx->A = D;
        }
+}
 #endif
diff --git a/src/lib/libcrypto/ripemd/rmd_one.c b/src/lib/libcrypto/ripemd/rmd_one.c
index 0d372f32f7..18b7460396 100644
--- a/src/lib/libcrypto/ripemd/rmd_one.c
+++ b/src/lib/libcrypto/ripemd/rmd_one.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: rmd_one.c,v 1.9 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: rmd_one.c,v 1.10 2023/07/08 06:52:56 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
@@ -61,18 +61,20 @@
 #include <openssl/ripemd.h>
 #include <openssl/crypto.h>
-unsigned char *RIPEMD160(const unsigned char *d, size_t n,
+unsigned char *
-             unsigned char *md)
+RIPEMD160(const unsigned char *d, size_t n,
-        {
+    unsigned char *md)
+{
        RIPEMD160_CTX c;
        static unsigned char m[RIPEMD160_DIGEST_LENGTH];
-        if (md == NULL) md=m;
+        if (md == NULL)
+                md = m;
        if (!RIPEMD160_Init(&c))
                return NULL;
-        RIPEMD160_Update(&c,d,n);
+        RIPEMD160_Update(&c, d, n);
-        RIPEMD160_Final(md,&c);
+        RIPEMD160_Final(md, &c);
-        explicit_bzero(&c,sizeof(c));
+        explicit_bzero(&c, sizeof(c));
-        return(md);
+        return (md);
-        }
+}
diff --git a/src/lib/libcrypto/ripemd/rmdconst.h b/src/lib/libcrypto/ripemd/rmdconst.h
index f34047f4ff..7d703da77d 100644
--- a/src/lib/libcrypto/ripemd/rmdconst.h
+++ b/src/lib/libcrypto/ripemd/rmdconst.h
@@ -1,25 +1,25 @@
-/* $OpenBSD: rmdconst.h,v 1.3 2016/12/21 15:49:29 jsing Exp $ */
+/* $OpenBSD: rmdconst.h,v 1.4 2023/07/08 06:52:56 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