summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2014-05-08 16:05:38 +0000
committerjsing <>2014-05-08 16:05:38 +0000
commit7779067b7b5b2153b20dc72d5116caaa3383df0c (patch)
treebccc71e2bc50ab48238241efca5212c0b3a7faa5
parentb590070115ee73703baaa8c896eed6bb11a45b0e (diff)
downloadopenbsd-7779067b7b5b2153b20dc72d5116caaa3383df0c.tar.gz
openbsd-7779067b7b5b2153b20dc72d5116caaa3383df0c.tar.bz2
openbsd-7779067b7b5b2153b20dc72d5116caaa3383df0c.zip
More KNF.
Diffstat
-rw-r--r--src/lib/libcrypto/evp/m_dss.c9
-rw-r--r--src/lib/libcrypto/evp/m_dss1.c9
-rw-r--r--src/lib/libcrypto/evp/m_ecdsa.c9
-rw-r--r--src/lib/libcrypto/evp/m_md4.c9
-rw-r--r--src/lib/libcrypto/evp/m_md5.c9
-rw-r--r--src/lib/libcrypto/evp/m_mdc2.c9
-rw-r--r--src/lib/libcrypto/evp/m_null.c9
-rw-r--r--src/lib/libcrypto/evp/m_ripemd.c9
-rw-r--r--src/lib/libcrypto/evp/m_sha.c9
-rw-r--r--src/lib/libcrypto/evp/m_sha1.c49
-rw-r--r--src/lib/libcrypto/evp/m_wp.c9
-rw-r--r--src/lib/libssl/src/crypto/evp/m_dss.c9
-rw-r--r--src/lib/libssl/src/crypto/evp/m_dss1.c9
-rw-r--r--src/lib/libssl/src/crypto/evp/m_ecdsa.c9
-rw-r--r--src/lib/libssl/src/crypto/evp/m_md4.c9
-rw-r--r--src/lib/libssl/src/crypto/evp/m_md5.c9
-rw-r--r--src/lib/libssl/src/crypto/evp/m_mdc2.c9
-rw-r--r--src/lib/libssl/src/crypto/evp/m_null.c9
-rw-r--r--src/lib/libssl/src/crypto/evp/m_ripemd.c9
-rw-r--r--src/lib/libssl/src/crypto/evp/m_sha.c9
-rw-r--r--src/lib/libssl/src/crypto/evp/m_sha1.c49
-rw-r--r--src/lib/libssl/src/crypto/evp/m_wp.c9
22 files changed, 188 insertions, 90 deletions
diff --git a/src/lib/libcrypto/evp/m_dss.c b/src/lib/libcrypto/evp/m_dss.c
index 1516b9da3f..9066b7b88f 100644
--- a/src/lib/libcrypto/evp/m_dss.c
+++ b/src/lib/libcrypto/evp/m_dss.c
@@ -67,17 +67,20 @@
67 67
68#ifndef OPENSSL_NO_SHA 68#ifndef OPENSSL_NO_SHA
69 69
70static int init(EVP_MD_CTX *ctx) 70static int
71init(EVP_MD_CTX *ctx)
71{ 72{
72 return SHA1_Init(ctx->md_data); 73 return SHA1_Init(ctx->md_data);
73} 74}
74 75
75static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 76static int
77update(EVP_MD_CTX *ctx, const void *data, size_t count)
76{ 78{
77 return SHA1_Update(ctx->md_data, data, count); 79 return SHA1_Update(ctx->md_data, data, count);
78} 80}
79 81
80static int final(EVP_MD_CTX *ctx, unsigned char *md) 82static int
83final(EVP_MD_CTX *ctx, unsigned char *md)
81{ 84{
82 return SHA1_Final(md, ctx->md_data); 85 return SHA1_Final(md, ctx->md_data);
83} 86}
diff --git a/src/lib/libcrypto/evp/m_dss1.c b/src/lib/libcrypto/evp/m_dss1.c
index 2d9feff095..ec79cd7c8c 100644
--- a/src/lib/libcrypto/evp/m_dss1.c
+++ b/src/lib/libcrypto/evp/m_dss1.c
@@ -68,17 +68,20 @@
68#include <openssl/dsa.h> 68#include <openssl/dsa.h>
69#endif 69#endif
70 70
71static int init(EVP_MD_CTX *ctx) 71static int
72init(EVP_MD_CTX *ctx)
72{ 73{
73 return SHA1_Init(ctx->md_data); 74 return SHA1_Init(ctx->md_data);
74} 75}
75 76
76static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 77static int
78update(EVP_MD_CTX *ctx, const void *data, size_t count)
77{ 79{
78 return SHA1_Update(ctx->md_data, data, count); 80 return SHA1_Update(ctx->md_data, data, count);
79} 81}
80 82
81static int final(EVP_MD_CTX *ctx, unsigned char *md) 83static int
84final(EVP_MD_CTX *ctx, unsigned char *md)
82{ 85{
83 return SHA1_Final(md, ctx->md_data); 86 return SHA1_Final(md, ctx->md_data);
84} 87}
diff --git a/src/lib/libcrypto/evp/m_ecdsa.c b/src/lib/libcrypto/evp/m_ecdsa.c
index 1d7714571c..a2dc889b86 100644
--- a/src/lib/libcrypto/evp/m_ecdsa.c
+++ b/src/lib/libcrypto/evp/m_ecdsa.c
@@ -117,17 +117,20 @@
117 117
118#ifndef OPENSSL_NO_SHA 118#ifndef OPENSSL_NO_SHA
119 119
120static int init(EVP_MD_CTX *ctx) 120static int
121init(EVP_MD_CTX *ctx)
121{ 122{
122 return SHA1_Init(ctx->md_data); 123 return SHA1_Init(ctx->md_data);
123} 124}
124 125
125static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 126static int
127update(EVP_MD_CTX *ctx, const void *data, size_t count)
126{ 128{
127 return SHA1_Update(ctx->md_data, data, count); 129 return SHA1_Update(ctx->md_data, data, count);
128} 130}
129 131
130static int final(EVP_MD_CTX *ctx, unsigned char *md) 132static int
133final(EVP_MD_CTX *ctx, unsigned char *md)
131{ 134{
132 return SHA1_Final(md, ctx->md_data); 135 return SHA1_Final(md, ctx->md_data);
133} 136}
diff --git a/src/lib/libcrypto/evp/m_md4.c b/src/lib/libcrypto/evp/m_md4.c
index 5a944e3c16..9d7dda26f3 100644
--- a/src/lib/libcrypto/evp/m_md4.c
+++ b/src/lib/libcrypto/evp/m_md4.c
@@ -71,17 +71,20 @@
71 71
72#include "evp_locl.h" 72#include "evp_locl.h"
73 73
74static int init(EVP_MD_CTX *ctx) 74static int
75init(EVP_MD_CTX *ctx)
75{ 76{
76 return MD4_Init(ctx->md_data); 77 return MD4_Init(ctx->md_data);
77} 78}
78 79
79static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 80static int
81update(EVP_MD_CTX *ctx, const void *data, size_t count)
80{ 82{
81 return MD4_Update(ctx->md_data, data, count); 83 return MD4_Update(ctx->md_data, data, count);
82} 84}
83 85
84static int final(EVP_MD_CTX *ctx, unsigned char *md) 86static int
87final(EVP_MD_CTX *ctx, unsigned char *md)
85{ 88{
86 return MD4_Final(md, ctx->md_data); 89 return MD4_Final(md, ctx->md_data);
87} 90}
diff --git a/src/lib/libcrypto/evp/m_md5.c b/src/lib/libcrypto/evp/m_md5.c
index 4ac9829886..03c78df9e8 100644
--- a/src/lib/libcrypto/evp/m_md5.c
+++ b/src/lib/libcrypto/evp/m_md5.c
@@ -70,17 +70,20 @@
70#endif 70#endif
71#include "evp_locl.h" 71#include "evp_locl.h"
72 72
73static int init(EVP_MD_CTX *ctx) 73static int
74init(EVP_MD_CTX *ctx)
74{ 75{
75 return MD5_Init(ctx->md_data); 76 return MD5_Init(ctx->md_data);
76} 77}
77 78
78static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 79static int
80update(EVP_MD_CTX *ctx, const void *data, size_t count)
79{ 81{
80 return MD5_Update(ctx->md_data, data, count); 82 return MD5_Update(ctx->md_data, data, count);
81} 83}
82 84
83static int final(EVP_MD_CTX *ctx, unsigned char *md) 85static int
86final(EVP_MD_CTX *ctx, unsigned char *md)
84{ 87{
85 return MD5_Final(md, ctx->md_data); 88 return MD5_Final(md, ctx->md_data);
86} 89}
diff --git a/src/lib/libcrypto/evp/m_mdc2.c b/src/lib/libcrypto/evp/m_mdc2.c
index 70ce53bee8..7983ed6acb 100644
--- a/src/lib/libcrypto/evp/m_mdc2.c
+++ b/src/lib/libcrypto/evp/m_mdc2.c
@@ -71,17 +71,20 @@
71 71
72#include "evp_locl.h" 72#include "evp_locl.h"
73 73
74static int init(EVP_MD_CTX *ctx) 74static int
75init(EVP_MD_CTX *ctx)
75{ 76{
76 return MDC2_Init(ctx->md_data); 77 return MDC2_Init(ctx->md_data);
77} 78}
78 79
79static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 80static int
81update(EVP_MD_CTX *ctx, const void *data, size_t count)
80{ 82{
81 return MDC2_Update(ctx->md_data, data, count); 83 return MDC2_Update(ctx->md_data, data, count);
82} 84}
83 85
84static int final(EVP_MD_CTX *ctx, unsigned char *md) 86static int
87final(EVP_MD_CTX *ctx, unsigned char *md)
85{ 88{
86 return MDC2_Final(md, ctx->md_data); 89 return MDC2_Final(md, ctx->md_data);
87} 90}
diff --git a/src/lib/libcrypto/evp/m_null.c b/src/lib/libcrypto/evp/m_null.c
index f3c00ad5c8..ad658e7045 100644
--- a/src/lib/libcrypto/evp/m_null.c
+++ b/src/lib/libcrypto/evp/m_null.c
@@ -62,17 +62,20 @@
62#include <openssl/objects.h> 62#include <openssl/objects.h>
63#include <openssl/x509.h> 63#include <openssl/x509.h>
64 64
65static int init(EVP_MD_CTX *ctx) 65static int
66init(EVP_MD_CTX *ctx)
66{ 67{
67 return 1; 68 return 1;
68} 69}
69 70
70static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 71static int
72update(EVP_MD_CTX *ctx, const void *data, size_t count)
71{ 73{
72 return 1; 74 return 1;
73} 75}
74 76
75static int final(EVP_MD_CTX *ctx, unsigned char *md) 77static int
78final(EVP_MD_CTX *ctx, unsigned char *md)
76{ 79{
77 return 1; 80 return 1;
78} 81}
diff --git a/src/lib/libcrypto/evp/m_ripemd.c b/src/lib/libcrypto/evp/m_ripemd.c
index 69f30eb983..5c48e3a8d6 100644
--- a/src/lib/libcrypto/evp/m_ripemd.c
+++ b/src/lib/libcrypto/evp/m_ripemd.c
@@ -70,17 +70,20 @@
70#endif 70#endif
71#include "evp_locl.h" 71#include "evp_locl.h"
72 72
73static int init(EVP_MD_CTX *ctx) 73static int
74init(EVP_MD_CTX *ctx)
74{ 75{
75 return RIPEMD160_Init(ctx->md_data); 76 return RIPEMD160_Init(ctx->md_data);
76} 77}
77 78
78static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 79static int
80update(EVP_MD_CTX *ctx, const void *data, size_t count)
79{ 81{
80 return RIPEMD160_Update(ctx->md_data, data, count); 82 return RIPEMD160_Update(ctx->md_data, data, count);
81} 83}
82 84
83static int final(EVP_MD_CTX *ctx, unsigned char *md) 85static int
86final(EVP_MD_CTX *ctx, unsigned char *md)
84{ 87{
85 return RIPEMD160_Final(md, ctx->md_data); 88 return RIPEMD160_Final(md, ctx->md_data);
86} 89}
diff --git a/src/lib/libcrypto/evp/m_sha.c b/src/lib/libcrypto/evp/m_sha.c
index d2d275f833..1b82e61c26 100644
--- a/src/lib/libcrypto/evp/m_sha.c
+++ b/src/lib/libcrypto/evp/m_sha.c
@@ -69,17 +69,20 @@
69#endif 69#endif
70#include "evp_locl.h" 70#include "evp_locl.h"
71 71
72static int init(EVP_MD_CTX *ctx) 72static int
73init(EVP_MD_CTX *ctx)
73{ 74{
74 return SHA_Init(ctx->md_data); 75 return SHA_Init(ctx->md_data);
75} 76}
76 77
77static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 78static int
79update(EVP_MD_CTX *ctx, const void *data, size_t count)
78{ 80{
79 return SHA_Update(ctx->md_data, data, count); 81 return SHA_Update(ctx->md_data, data, count);
80} 82}
81 83
82static int final(EVP_MD_CTX *ctx, unsigned char *md) 84static int
85final(EVP_MD_CTX *ctx, unsigned char *md)
83{ 86{
84 return SHA_Final(md, ctx->md_data); 87 return SHA_Final(md, ctx->md_data);
85} 88}
diff --git a/src/lib/libcrypto/evp/m_sha1.c b/src/lib/libcrypto/evp/m_sha1.c
index 8c7e4eb222..e4af84acd2 100644
--- a/src/lib/libcrypto/evp/m_sha1.c
+++ b/src/lib/libcrypto/evp/m_sha1.c
@@ -69,17 +69,20 @@
69#endif 69#endif
70 70
71 71
72static int init(EVP_MD_CTX *ctx) 72static int
73init(EVP_MD_CTX *ctx)
73{ 74{
74 return SHA1_Init(ctx->md_data); 75 return SHA1_Init(ctx->md_data);
75} 76}
76 77
77static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 78static int
79update(EVP_MD_CTX *ctx, const void *data, size_t count)
78{ 80{
79 return SHA1_Update(ctx->md_data, data, count); 81 return SHA1_Update(ctx->md_data, data, count);
80} 82}
81 83
82static int final(EVP_MD_CTX *ctx, unsigned char *md) 84static int
85final(EVP_MD_CTX *ctx, unsigned char *md)
83{ 86{
84 return SHA1_Final(md, ctx->md_data); 87 return SHA1_Final(md, ctx->md_data);
85} 88}
@@ -107,11 +110,14 @@ EVP_sha1(void)
107#endif 110#endif
108 111
109#ifndef OPENSSL_NO_SHA256 112#ifndef OPENSSL_NO_SHA256
110static int init224(EVP_MD_CTX *ctx) 113static int
114init224(EVP_MD_CTX *ctx)
111{ 115{
112 return SHA224_Init(ctx->md_data); 116 return SHA224_Init(ctx->md_data);
113} 117}
114static int init256(EVP_MD_CTX *ctx) 118
119static int
120init256(EVP_MD_CTX *ctx)
115{ 121{
116 return SHA256_Init(ctx->md_data); 122 return SHA256_Init(ctx->md_data);
117} 123}
@@ -120,11 +126,14 @@ static int init256(EVP_MD_CTX *ctx)
120 * SHA256 functions even in SHA224 context. This is what happens 126 * SHA256 functions even in SHA224 context. This is what happens
121 * there anyway, so we can spare few CPU cycles:-) 127 * there anyway, so we can spare few CPU cycles:-)
122 */ 128 */
123static int update256(EVP_MD_CTX *ctx, const void *data, size_t count) 129static int
130update256(EVP_MD_CTX *ctx, const void *data, size_t count)
124{ 131{
125 return SHA256_Update(ctx->md_data, data, count); 132 return SHA256_Update(ctx->md_data, data, count);
126} 133}
127static int final256(EVP_MD_CTX *ctx, unsigned char *md) 134
135static int
136final256(EVP_MD_CTX *ctx, unsigned char *md)
128{ 137{
129 return SHA256_Final(md, ctx->md_data); 138 return SHA256_Final(md, ctx->md_data);
130} 139}
@@ -144,7 +153,8 @@ static const EVP_MD sha224_md = {
144 sizeof(EVP_MD *) + sizeof(SHA256_CTX), 153 sizeof(EVP_MD *) + sizeof(SHA256_CTX),
145}; 154};
146 155
147const EVP_MD *EVP_sha224(void) 156const EVP_MD *
157EVP_sha224(void)
148{ 158{
149 return (&sha224_md); 159 return (&sha224_md);
150} 160}
@@ -164,27 +174,34 @@ static const EVP_MD sha256_md = {
164 sizeof(EVP_MD *) + sizeof(SHA256_CTX), 174 sizeof(EVP_MD *) + sizeof(SHA256_CTX),
165}; 175};
166 176
167const EVP_MD *EVP_sha256(void) 177const EVP_MD *
178EVP_sha256(void)
168{ 179{
169 return (&sha256_md); 180 return (&sha256_md);
170} 181}
171#endif /* ifndef OPENSSL_NO_SHA256 */ 182#endif /* ifndef OPENSSL_NO_SHA256 */
172 183
173#ifndef OPENSSL_NO_SHA512 184#ifndef OPENSSL_NO_SHA512
174static int init384(EVP_MD_CTX *ctx) 185static int
186init384(EVP_MD_CTX *ctx)
175{ 187{
176 return SHA384_Init(ctx->md_data); 188 return SHA384_Init(ctx->md_data);
177} 189}
178static int init512(EVP_MD_CTX *ctx) 190
191static int
192init512(EVP_MD_CTX *ctx)
179{ 193{
180 return SHA512_Init(ctx->md_data); 194 return SHA512_Init(ctx->md_data);
181} 195}
182/* See comment in SHA224/256 section */ 196/* See comment in SHA224/256 section */
183static int update512(EVP_MD_CTX *ctx, const void *data, size_t count) 197static int
198update512(EVP_MD_CTX *ctx, const void *data, size_t count)
184{ 199{
185 return SHA512_Update(ctx->md_data, data, count); 200 return SHA512_Update(ctx->md_data, data, count);
186} 201}
187static int final512(EVP_MD_CTX *ctx, unsigned char *md) 202
203static int
204final512(EVP_MD_CTX *ctx, unsigned char *md)
188{ 205{
189 return SHA512_Final(md, ctx->md_data); 206 return SHA512_Final(md, ctx->md_data);
190} 207}
@@ -204,7 +221,8 @@ static const EVP_MD sha384_md = {
204 sizeof(EVP_MD *) + sizeof(SHA512_CTX), 221 sizeof(EVP_MD *) + sizeof(SHA512_CTX),
205}; 222};
206 223
207const EVP_MD *EVP_sha384(void) 224const EVP_MD *
225EVP_sha384(void)
208{ 226{
209 return (&sha384_md); 227 return (&sha384_md);
210} 228}
@@ -224,7 +242,8 @@ static const EVP_MD sha512_md = {
224 sizeof(EVP_MD *) + sizeof(SHA512_CTX), 242 sizeof(EVP_MD *) + sizeof(SHA512_CTX),
225}; 243};
226 244
227const EVP_MD *EVP_sha512(void) 245const EVP_MD *
246EVP_sha512(void)
228{ 247{
229 return (&sha512_md); 248 return (&sha512_md);
230} 249}
diff --git a/src/lib/libcrypto/evp/m_wp.c b/src/lib/libcrypto/evp/m_wp.c
index 3991a71c17..ca53be6abb 100644
--- a/src/lib/libcrypto/evp/m_wp.c
+++ b/src/lib/libcrypto/evp/m_wp.c
@@ -11,17 +11,20 @@
11#include <openssl/whrlpool.h> 11#include <openssl/whrlpool.h>
12#include "evp_locl.h" 12#include "evp_locl.h"
13 13
14static int init(EVP_MD_CTX *ctx) 14static int
15init(EVP_MD_CTX *ctx)
15{ 16{
16 return WHIRLPOOL_Init(ctx->md_data); 17 return WHIRLPOOL_Init(ctx->md_data);
17} 18}
18 19
19static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 20static int
21update(EVP_MD_CTX *ctx, const void *data, size_t count)
20{ 22{
21 return WHIRLPOOL_Update(ctx->md_data, data, count); 23 return WHIRLPOOL_Update(ctx->md_data, data, count);
22} 24}
23 25
24static int final(EVP_MD_CTX *ctx, unsigned char *md) 26static int
27final(EVP_MD_CTX *ctx, unsigned char *md)
25{ 28{
26 return WHIRLPOOL_Final(md, ctx->md_data); 29 return WHIRLPOOL_Final(md, ctx->md_data);
27} 30}
diff --git a/src/lib/libssl/src/crypto/evp/m_dss.c b/src/lib/libssl/src/crypto/evp/m_dss.c
index 1516b9da3f..9066b7b88f 100644
--- a/src/lib/libssl/src/crypto/evp/m_dss.c
+++ b/src/lib/libssl/src/crypto/evp/m_dss.c
@@ -67,17 +67,20 @@
67 67
68#ifndef OPENSSL_NO_SHA 68#ifndef OPENSSL_NO_SHA
69 69
70static int init(EVP_MD_CTX *ctx) 70static int
71init(EVP_MD_CTX *ctx)
71{ 72{
72 return SHA1_Init(ctx->md_data); 73 return SHA1_Init(ctx->md_data);
73} 74}
74 75
75static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 76static int
77update(EVP_MD_CTX *ctx, const void *data, size_t count)
76{ 78{
77 return SHA1_Update(ctx->md_data, data, count); 79 return SHA1_Update(ctx->md_data, data, count);
78} 80}
79 81
80static int final(EVP_MD_CTX *ctx, unsigned char *md) 82static int
83final(EVP_MD_CTX *ctx, unsigned char *md)
81{ 84{
82 return SHA1_Final(md, ctx->md_data); 85 return SHA1_Final(md, ctx->md_data);
83} 86}
diff --git a/src/lib/libssl/src/crypto/evp/m_dss1.c b/src/lib/libssl/src/crypto/evp/m_dss1.c
index 2d9feff095..ec79cd7c8c 100644
--- a/src/lib/libssl/src/crypto/evp/m_dss1.c
+++ b/src/lib/libssl/src/crypto/evp/m_dss1.c
@@ -68,17 +68,20 @@
68#include <openssl/dsa.h> 68#include <openssl/dsa.h>
69#endif 69#endif
70 70
71static int init(EVP_MD_CTX *ctx) 71static int
72init(EVP_MD_CTX *ctx)
72{ 73{
73 return SHA1_Init(ctx->md_data); 74 return SHA1_Init(ctx->md_data);
74} 75}
75 76
76static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 77static int
78update(EVP_MD_CTX *ctx, const void *data, size_t count)
77{ 79{
78 return SHA1_Update(ctx->md_data, data, count); 80 return SHA1_Update(ctx->md_data, data, count);
79} 81}
80 82
81static int final(EVP_MD_CTX *ctx, unsigned char *md) 83static int
84final(EVP_MD_CTX *ctx, unsigned char *md)
82{ 85{
83 return SHA1_Final(md, ctx->md_data); 86 return SHA1_Final(md, ctx->md_data);
84} 87}
diff --git a/src/lib/libssl/src/crypto/evp/m_ecdsa.c b/src/lib/libssl/src/crypto/evp/m_ecdsa.c
index 1d7714571c..a2dc889b86 100644
--- a/src/lib/libssl/src/crypto/evp/m_ecdsa.c
+++ b/src/lib/libssl/src/crypto/evp/m_ecdsa.c
@@ -117,17 +117,20 @@
117 117
118#ifndef OPENSSL_NO_SHA 118#ifndef OPENSSL_NO_SHA
119 119
120static int init(EVP_MD_CTX *ctx) 120static int
121init(EVP_MD_CTX *ctx)
121{ 122{
122 return SHA1_Init(ctx->md_data); 123 return SHA1_Init(ctx->md_data);
123} 124}
124 125
125static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 126static int
127update(EVP_MD_CTX *ctx, const void *data, size_t count)
126{ 128{
127 return SHA1_Update(ctx->md_data, data, count); 129 return SHA1_Update(ctx->md_data, data, count);
128} 130}
129 131
130static int final(EVP_MD_CTX *ctx, unsigned char *md) 132static int
133final(EVP_MD_CTX *ctx, unsigned char *md)
131{ 134{
132 return SHA1_Final(md, ctx->md_data); 135 return SHA1_Final(md, ctx->md_data);
133} 136}
diff --git a/src/lib/libssl/src/crypto/evp/m_md4.c b/src/lib/libssl/src/crypto/evp/m_md4.c
index 5a944e3c16..9d7dda26f3 100644
--- a/src/lib/libssl/src/crypto/evp/m_md4.c
+++ b/src/lib/libssl/src/crypto/evp/m_md4.c
@@ -71,17 +71,20 @@
71 71
72#include "evp_locl.h" 72#include "evp_locl.h"
73 73
74static int init(EVP_MD_CTX *ctx) 74static int
75init(EVP_MD_CTX *ctx)
75{ 76{
76 return MD4_Init(ctx->md_data); 77 return MD4_Init(ctx->md_data);
77} 78}
78 79
79static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 80static int
81update(EVP_MD_CTX *ctx, const void *data, size_t count)
80{ 82{
81 return MD4_Update(ctx->md_data, data, count); 83 return MD4_Update(ctx->md_data, data, count);
82} 84}
83 85
84static int final(EVP_MD_CTX *ctx, unsigned char *md) 86static int
87final(EVP_MD_CTX *ctx, unsigned char *md)
85{ 88{
86 return MD4_Final(md, ctx->md_data); 89 return MD4_Final(md, ctx->md_data);
87} 90}
diff --git a/src/lib/libssl/src/crypto/evp/m_md5.c b/src/lib/libssl/src/crypto/evp/m_md5.c
index 4ac9829886..03c78df9e8 100644
--- a/src/lib/libssl/src/crypto/evp/m_md5.c
+++ b/src/lib/libssl/src/crypto/evp/m_md5.c
@@ -70,17 +70,20 @@
70#endif 70#endif
71#include "evp_locl.h" 71#include "evp_locl.h"
72 72
73static int init(EVP_MD_CTX *ctx) 73static int
74init(EVP_MD_CTX *ctx)
74{ 75{
75 return MD5_Init(ctx->md_data); 76 return MD5_Init(ctx->md_data);
76} 77}
77 78
78static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 79static int
80update(EVP_MD_CTX *ctx, const void *data, size_t count)
79{ 81{
80 return MD5_Update(ctx->md_data, data, count); 82 return MD5_Update(ctx->md_data, data, count);
81} 83}
82 84
83static int final(EVP_MD_CTX *ctx, unsigned char *md) 85static int
86final(EVP_MD_CTX *ctx, unsigned char *md)
84{ 87{
85 return MD5_Final(md, ctx->md_data); 88 return MD5_Final(md, ctx->md_data);
86} 89}
diff --git a/src/lib/libssl/src/crypto/evp/m_mdc2.c b/src/lib/libssl/src/crypto/evp/m_mdc2.c
index 70ce53bee8..7983ed6acb 100644
--- a/src/lib/libssl/src/crypto/evp/m_mdc2.c
+++ b/src/lib/libssl/src/crypto/evp/m_mdc2.c
@@ -71,17 +71,20 @@
71 71
72#include "evp_locl.h" 72#include "evp_locl.h"
73 73
74static int init(EVP_MD_CTX *ctx) 74static int
75init(EVP_MD_CTX *ctx)
75{ 76{
76 return MDC2_Init(ctx->md_data); 77 return MDC2_Init(ctx->md_data);
77} 78}
78 79
79static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 80static int
81update(EVP_MD_CTX *ctx, const void *data, size_t count)
80{ 82{
81 return MDC2_Update(ctx->md_data, data, count); 83 return MDC2_Update(ctx->md_data, data, count);
82} 84}
83 85
84static int final(EVP_MD_CTX *ctx, unsigned char *md) 86static int
87final(EVP_MD_CTX *ctx, unsigned char *md)
85{ 88{
86 return MDC2_Final(md, ctx->md_data); 89 return MDC2_Final(md, ctx->md_data);
87} 90}
diff --git a/src/lib/libssl/src/crypto/evp/m_null.c b/src/lib/libssl/src/crypto/evp/m_null.c
index f3c00ad5c8..ad658e7045 100644
--- a/src/lib/libssl/src/crypto/evp/m_null.c
+++ b/src/lib/libssl/src/crypto/evp/m_null.c
@@ -62,17 +62,20 @@
62#include <openssl/objects.h> 62#include <openssl/objects.h>
63#include <openssl/x509.h> 63#include <openssl/x509.h>
64 64
65static int init(EVP_MD_CTX *ctx) 65static int
66init(EVP_MD_CTX *ctx)
66{ 67{
67 return 1; 68 return 1;
68} 69}
69 70
70static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 71static int
72update(EVP_MD_CTX *ctx, const void *data, size_t count)
71{ 73{
72 return 1; 74 return 1;
73} 75}
74 76
75static int final(EVP_MD_CTX *ctx, unsigned char *md) 77static int
78final(EVP_MD_CTX *ctx, unsigned char *md)
76{ 79{
77 return 1; 80 return 1;
78} 81}
diff --git a/src/lib/libssl/src/crypto/evp/m_ripemd.c b/src/lib/libssl/src/crypto/evp/m_ripemd.c
index 69f30eb983..5c48e3a8d6 100644
--- a/src/lib/libssl/src/crypto/evp/m_ripemd.c
+++ b/src/lib/libssl/src/crypto/evp/m_ripemd.c
@@ -70,17 +70,20 @@
70#endif 70#endif
71#include "evp_locl.h" 71#include "evp_locl.h"
72 72
73static int init(EVP_MD_CTX *ctx) 73static int
74init(EVP_MD_CTX *ctx)
74{ 75{
75 return RIPEMD160_Init(ctx->md_data); 76 return RIPEMD160_Init(ctx->md_data);
76} 77}
77 78
78static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 79static int
80update(EVP_MD_CTX *ctx, const void *data, size_t count)
79{ 81{
80 return RIPEMD160_Update(ctx->md_data, data, count); 82 return RIPEMD160_Update(ctx->md_data, data, count);
81} 83}
82 84
83static int final(EVP_MD_CTX *ctx, unsigned char *md) 85static int
86final(EVP_MD_CTX *ctx, unsigned char *md)
84{ 87{
85 return RIPEMD160_Final(md, ctx->md_data); 88 return RIPEMD160_Final(md, ctx->md_data);
86} 89}
diff --git a/src/lib/libssl/src/crypto/evp/m_sha.c b/src/lib/libssl/src/crypto/evp/m_sha.c
index d2d275f833..1b82e61c26 100644
--- a/src/lib/libssl/src/crypto/evp/m_sha.c
+++ b/src/lib/libssl/src/crypto/evp/m_sha.c
@@ -69,17 +69,20 @@
69#endif 69#endif
70#include "evp_locl.h" 70#include "evp_locl.h"
71 71
72static int init(EVP_MD_CTX *ctx) 72static int
73init(EVP_MD_CTX *ctx)
73{ 74{
74 return SHA_Init(ctx->md_data); 75 return SHA_Init(ctx->md_data);
75} 76}
76 77
77static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 78static int
79update(EVP_MD_CTX *ctx, const void *data, size_t count)
78{ 80{
79 return SHA_Update(ctx->md_data, data, count); 81 return SHA_Update(ctx->md_data, data, count);
80} 82}
81 83
82static int final(EVP_MD_CTX *ctx, unsigned char *md) 84static int
85final(EVP_MD_CTX *ctx, unsigned char *md)
83{ 86{
84 return SHA_Final(md, ctx->md_data); 87 return SHA_Final(md, ctx->md_data);
85} 88}
diff --git a/src/lib/libssl/src/crypto/evp/m_sha1.c b/src/lib/libssl/src/crypto/evp/m_sha1.c
index 8c7e4eb222..e4af84acd2 100644
--- a/src/lib/libssl/src/crypto/evp/m_sha1.c
+++ b/src/lib/libssl/src/crypto/evp/m_sha1.c
@@ -69,17 +69,20 @@
69#endif 69#endif
70 70
71 71
72static int init(EVP_MD_CTX *ctx) 72static int
73init(EVP_MD_CTX *ctx)
73{ 74{
74 return SHA1_Init(ctx->md_data); 75 return SHA1_Init(ctx->md_data);
75} 76}
76 77
77static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 78static int
79update(EVP_MD_CTX *ctx, const void *data, size_t count)
78{ 80{
79 return SHA1_Update(ctx->md_data, data, count); 81 return SHA1_Update(ctx->md_data, data, count);
80} 82}
81 83
82static int final(EVP_MD_CTX *ctx, unsigned char *md) 84static int
85final(EVP_MD_CTX *ctx, unsigned char *md)
83{ 86{
84 return SHA1_Final(md, ctx->md_data); 87 return SHA1_Final(md, ctx->md_data);
85} 88}
@@ -107,11 +110,14 @@ EVP_sha1(void)
107#endif 110#endif
108 111
109#ifndef OPENSSL_NO_SHA256 112#ifndef OPENSSL_NO_SHA256
110static int init224(EVP_MD_CTX *ctx) 113static int
114init224(EVP_MD_CTX *ctx)
111{ 115{
112 return SHA224_Init(ctx->md_data); 116 return SHA224_Init(ctx->md_data);
113} 117}
114static int init256(EVP_MD_CTX *ctx) 118
119static int
120init256(EVP_MD_CTX *ctx)
115{ 121{
116 return SHA256_Init(ctx->md_data); 122 return SHA256_Init(ctx->md_data);
117} 123}
@@ -120,11 +126,14 @@ static int init256(EVP_MD_CTX *ctx)
120 * SHA256 functions even in SHA224 context. This is what happens 126 * SHA256 functions even in SHA224 context. This is what happens
121 * there anyway, so we can spare few CPU cycles:-) 127 * there anyway, so we can spare few CPU cycles:-)
122 */ 128 */
123static int update256(EVP_MD_CTX *ctx, const void *data, size_t count) 129static int
130update256(EVP_MD_CTX *ctx, const void *data, size_t count)
124{ 131{
125 return SHA256_Update(ctx->md_data, data, count); 132 return SHA256_Update(ctx->md_data, data, count);
126} 133}
127static int final256(EVP_MD_CTX *ctx, unsigned char *md) 134
135static int
136final256(EVP_MD_CTX *ctx, unsigned char *md)
128{ 137{
129 return SHA256_Final(md, ctx->md_data); 138 return SHA256_Final(md, ctx->md_data);
130} 139}
@@ -144,7 +153,8 @@ static const EVP_MD sha224_md = {
144 sizeof(EVP_MD *) + sizeof(SHA256_CTX), 153 sizeof(EVP_MD *) + sizeof(SHA256_CTX),
145}; 154};
146 155
147const EVP_MD *EVP_sha224(void) 156const EVP_MD *
157EVP_sha224(void)
148{ 158{
149 return (&sha224_md); 159 return (&sha224_md);
150} 160}
@@ -164,27 +174,34 @@ static const EVP_MD sha256_md = {
164 sizeof(EVP_MD *) + sizeof(SHA256_CTX), 174 sizeof(EVP_MD *) + sizeof(SHA256_CTX),
165}; 175};
166 176
167const EVP_MD *EVP_sha256(void) 177const EVP_MD *
178EVP_sha256(void)
168{ 179{
169 return (&sha256_md); 180 return (&sha256_md);
170} 181}
171#endif /* ifndef OPENSSL_NO_SHA256 */ 182#endif /* ifndef OPENSSL_NO_SHA256 */
172 183
173#ifndef OPENSSL_NO_SHA512 184#ifndef OPENSSL_NO_SHA512
174static int init384(EVP_MD_CTX *ctx) 185static int
186init384(EVP_MD_CTX *ctx)
175{ 187{
176 return SHA384_Init(ctx->md_data); 188 return SHA384_Init(ctx->md_data);
177} 189}
178static int init512(EVP_MD_CTX *ctx) 190
191static int
192init512(EVP_MD_CTX *ctx)
179{ 193{
180 return SHA512_Init(ctx->md_data); 194 return SHA512_Init(ctx->md_data);
181} 195}
182/* See comment in SHA224/256 section */ 196/* See comment in SHA224/256 section */
183static int update512(EVP_MD_CTX *ctx, const void *data, size_t count) 197static int
198update512(EVP_MD_CTX *ctx, const void *data, size_t count)
184{ 199{
185 return SHA512_Update(ctx->md_data, data, count); 200 return SHA512_Update(ctx->md_data, data, count);
186} 201}
187static int final512(EVP_MD_CTX *ctx, unsigned char *md) 202
203static int
204final512(EVP_MD_CTX *ctx, unsigned char *md)
188{ 205{
189 return SHA512_Final(md, ctx->md_data); 206 return SHA512_Final(md, ctx->md_data);
190} 207}
@@ -204,7 +221,8 @@ static const EVP_MD sha384_md = {
204 sizeof(EVP_MD *) + sizeof(SHA512_CTX), 221 sizeof(EVP_MD *) + sizeof(SHA512_CTX),
205}; 222};
206 223
207const EVP_MD *EVP_sha384(void) 224const EVP_MD *
225EVP_sha384(void)
208{ 226{
209 return (&sha384_md); 227 return (&sha384_md);
210} 228}
@@ -224,7 +242,8 @@ static const EVP_MD sha512_md = {
224 sizeof(EVP_MD *) + sizeof(SHA512_CTX), 242 sizeof(EVP_MD *) + sizeof(SHA512_CTX),
225}; 243};
226 244
227const EVP_MD *EVP_sha512(void) 245const EVP_MD *
246EVP_sha512(void)
228{ 247{
229 return (&sha512_md); 248 return (&sha512_md);
230} 249}
diff --git a/src/lib/libssl/src/crypto/evp/m_wp.c b/src/lib/libssl/src/crypto/evp/m_wp.c
index 3991a71c17..ca53be6abb 100644
--- a/src/lib/libssl/src/crypto/evp/m_wp.c
+++ b/src/lib/libssl/src/crypto/evp/m_wp.c
@@ -11,17 +11,20 @@
11#include <openssl/whrlpool.h> 11#include <openssl/whrlpool.h>
12#include "evp_locl.h" 12#include "evp_locl.h"
13 13
14static int init(EVP_MD_CTX *ctx) 14static int
15init(EVP_MD_CTX *ctx)
15{ 16{
16 return WHIRLPOOL_Init(ctx->md_data); 17 return WHIRLPOOL_Init(ctx->md_data);
17} 18}
18 19
19static int update(EVP_MD_CTX *ctx, const void *data, size_t count) 20static int
21update(EVP_MD_CTX *ctx, const void *data, size_t count)
20{ 22{
21 return WHIRLPOOL_Update(ctx->md_data, data, count); 23 return WHIRLPOOL_Update(ctx->md_data, data, count);
22} 24}
23 25
24static int final(EVP_MD_CTX *ctx, unsigned char *md) 26static int
27final(EVP_MD_CTX *ctx, unsigned char *md)
25{ 28{
26 return WHIRLPOOL_Final(md, ctx->md_data); 29 return WHIRLPOOL_Final(md, ctx->md_data);
27} 30}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 05:34:21 +0000