1 files changed, 90 insertions, 60 deletions
diff --git a/src/lib/libcrypto/evp/m_sha1.c b/src/lib/libcrypto/evp/m_sha1.c
index e4af84acd2..9a10e703cc 100644
--- a/src/lib/libcrypto/evp/m_sha1.c
+++ b/src/lib/libcrypto/evp/m_sha1.c
@@ -88,18 +88,24 @@ final(EVP_MD_CTX *ctx, unsigned char *md)
 }
 static const EVP_MD sha1_md = {
-        NID_sha1,
+        .type = NID_sha1,
-        NID_sha1WithRSAEncryption,
+        .pkey_type = NID_sha1WithRSAEncryption,
-        SHA_DIGEST_LENGTH,
+        .md_size = SHA_DIGEST_LENGTH,
-        EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
+        .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
-        init,
+        .init = init,
-        update,
+        .update = update,
-        final,
+        .final = final,
-        NULL,
+        .copy = NULL,
-        NULL,
+        .cleanup = NULL,
-        EVP_PKEY_RSA_method,
+#ifndef OPENSSL_NO_RSA
-        SHA_CBLOCK,
+        .sign = (evp_sign_method *)RSA_sign,
-        sizeof(EVP_MD *) + sizeof(SHA_CTX),
+        .verify = (evp_verify_method *)RSA_verify,
+        .required_pkey_type = {
+                EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
+        },
+#endif
+        .block_size = SHA_CBLOCK,
+        .ctx_size = sizeof(EVP_MD *) + sizeof(SHA_CTX),
 };
 const EVP_MD *
@@ -139,18 +145,24 @@ final256(EVP_MD_CTX *ctx, unsigned char *md)
 }
 static const EVP_MD sha224_md = {
-        NID_sha224,
+        .type = NID_sha224,
-        NID_sha224WithRSAEncryption,
+        .pkey_type = NID_sha224WithRSAEncryption,
-        SHA224_DIGEST_LENGTH,
+        .md_size = SHA224_DIGEST_LENGTH,
-        EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
+        .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
-        init224,
+        .init = init224,
-        update256,
+        .update = update256,
-        final256,
+        .final = final256,
-        NULL,
+        .copy = NULL,
-        NULL,
+        .cleanup = NULL,
-        EVP_PKEY_RSA_method,
+#ifndef OPENSSL_NO_RSA
-        SHA256_CBLOCK,
+        .sign = (evp_sign_method *)RSA_sign,
-        sizeof(EVP_MD *) + sizeof(SHA256_CTX),
+        .verify = (evp_verify_method *)RSA_verify,
+        .required_pkey_type = {
+                EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
+        },
+#endif
+        .block_size = SHA256_CBLOCK,
+        .ctx_size = sizeof(EVP_MD *) + sizeof(SHA256_CTX),
 };
 const EVP_MD *
@@ -160,18 +172,24 @@ EVP_sha224(void)
 }
 static const EVP_MD sha256_md = {
-        NID_sha256,
+        .type = NID_sha256,
-        NID_sha256WithRSAEncryption,
+        .pkey_type = NID_sha256WithRSAEncryption,
-        SHA256_DIGEST_LENGTH,
+        .md_size = SHA256_DIGEST_LENGTH,
-        EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
+        .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
-        init256,
+        .init = init256,
-        update256,
+        .update = update256,
-        final256,
+        .final = final256,
-        NULL,
+        .copy = NULL,
-        NULL,
+        .cleanup = NULL,
-        EVP_PKEY_RSA_method,
+#ifndef OPENSSL_NO_RSA
-        SHA256_CBLOCK,
+        .sign = (evp_sign_method *)RSA_sign,
-        sizeof(EVP_MD *) + sizeof(SHA256_CTX),
+        .verify = (evp_verify_method *)RSA_verify,
+        .required_pkey_type = {
+                EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
+        },
+#endif
+        .block_size = SHA256_CBLOCK,
+        .ctx_size = sizeof(EVP_MD *) + sizeof(SHA256_CTX),
 };
 const EVP_MD *
@@ -207,18 +225,24 @@ final512(EVP_MD_CTX *ctx, unsigned char *md)
 }
 static const EVP_MD sha384_md = {
-        NID_sha384,
+        .type = NID_sha384,
-        NID_sha384WithRSAEncryption,
+        .pkey_type = NID_sha384WithRSAEncryption,
-        SHA384_DIGEST_LENGTH,
+        .md_size = SHA384_DIGEST_LENGTH,
-        EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
+        .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
-        init384,
+        .init = init384,
-        update512,
+        .update = update512,
-        final512,
+        .final = final512,
-        NULL,
+        .copy = NULL,
-        NULL,
+        .cleanup = NULL,
-        EVP_PKEY_RSA_method,
+#ifndef OPENSSL_NO_RSA
-        SHA512_CBLOCK,
+        .sign = (evp_sign_method *)RSA_sign,
-        sizeof(EVP_MD *) + sizeof(SHA512_CTX),
+        .verify = (evp_verify_method *)RSA_verify,
+        .required_pkey_type = {
+                EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
+        },
+#endif
+        .block_size = SHA512_CBLOCK,
+        .ctx_size = sizeof(EVP_MD *) + sizeof(SHA512_CTX),
 };
 const EVP_MD *
@@ -228,18 +252,24 @@ EVP_sha384(void)
 }
 static const EVP_MD sha512_md = {
-        NID_sha512,
+        .type = NID_sha512,
-        NID_sha512WithRSAEncryption,
+        .pkey_type = NID_sha512WithRSAEncryption,
-        SHA512_DIGEST_LENGTH,
+        .md_size = SHA512_DIGEST_LENGTH,
-        EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
+        .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
-        init512,
+        .init = init512,
-        update512,
+        .update = update512,
-        final512,
+        .final = final512,
-        NULL,
+        .copy = NULL,
-        NULL,
+        .cleanup = NULL,
-        EVP_PKEY_RSA_method,
+#ifndef OPENSSL_NO_RSA
-        SHA512_CBLOCK,
+        .sign = (evp_sign_method *)RSA_sign,
-        sizeof(EVP_MD *) + sizeof(SHA512_CTX),
+        .verify = (evp_verify_method *)RSA_verify,
+        .required_pkey_type = {
+                EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
+        },
+#endif
+        .block_size = SHA512_CBLOCK,
+        .ctx_size = sizeof(EVP_MD *) + sizeof(SHA512_CTX),
 };
 const EVP_MD *

diff --git a/src/lib/libcrypto/evp/m_sha1.c b/src/lib/libcrypto/evp/m_sha1.c index e4af84acd2..9a10e703cc 100644 --- a/src/lib/libcrypto/evp/m_sha1.c +++ b/src/lib/libcrypto/evp/m_sha1.c
@@ -88,18 +88,24 @@ final(EVP_MD_CTX ctx, unsigned char md)
88	}	88	}
89		89
90	static const EVP_MD sha1_md = {	90	static const EVP_MD sha1_md = {
91	NID_sha1,	91	.type = NID_sha1,
92	NID_sha1WithRSAEncryption,	92	.pkey_type = NID_sha1WithRSAEncryption,
93	SHA_DIGEST_LENGTH,	93	.md_size = SHA_DIGEST_LENGTH,
94	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE\|EVP_MD_FLAG_DIGALGID_ABSENT,	94	.flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE\|EVP_MD_FLAG_DIGALGID_ABSENT,
95	init,	95	.init = init,
96	update,	96	.update = update,
97	final,	97	.final = final,
98	NULL,	98	.copy = NULL,
99	NULL,	99	.cleanup = NULL,
100	EVP_PKEY_RSA_method,	100	#ifndef OPENSSL_NO_RSA
101	SHA_CBLOCK,	101	.sign = (evp_sign_method *)RSA_sign,
102	sizeof(EVP_MD *) + sizeof(SHA_CTX),	102	.verify = (evp_verify_method *)RSA_verify,
		103	.required_pkey_type = {
		104	EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
		105	},
		106	#endif
		107	.block_size = SHA_CBLOCK,
		108	.ctx_size = sizeof(EVP_MD *) + sizeof(SHA_CTX),
103	};	109	};
104		110
105	const EVP_MD *	111	const EVP_MD *
@@ -139,18 +145,24 @@ final256(EVP_MD_CTX ctx, unsigned char md)
139	}	145	}
140		146
141	static const EVP_MD sha224_md = {	147	static const EVP_MD sha224_md = {
142	NID_sha224,	148	.type = NID_sha224,
143	NID_sha224WithRSAEncryption,	149	.pkey_type = NID_sha224WithRSAEncryption,
144	SHA224_DIGEST_LENGTH,	150	.md_size = SHA224_DIGEST_LENGTH,
145	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE\|EVP_MD_FLAG_DIGALGID_ABSENT,	151	.flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE\|EVP_MD_FLAG_DIGALGID_ABSENT,
146	init224,	152	.init = init224,
147	update256,	153	.update = update256,
148	final256,	154	.final = final256,
149	NULL,	155	.copy = NULL,
150	NULL,	156	.cleanup = NULL,
151	EVP_PKEY_RSA_method,	157	#ifndef OPENSSL_NO_RSA
152	SHA256_CBLOCK,	158	.sign = (evp_sign_method *)RSA_sign,
153	sizeof(EVP_MD *) + sizeof(SHA256_CTX),	159	.verify = (evp_verify_method *)RSA_verify,
		160	.required_pkey_type = {
		161	EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
		162	},
		163	#endif
		164	.block_size = SHA256_CBLOCK,
		165	.ctx_size = sizeof(EVP_MD *) + sizeof(SHA256_CTX),
154	};	166	};
155		167
156	const EVP_MD *	168	const EVP_MD *
@@ -160,18 +172,24 @@ EVP_sha224(void)
160	}	172	}
161		173
162	static const EVP_MD sha256_md = {	174	static const EVP_MD sha256_md = {
163	NID_sha256,	175	.type = NID_sha256,
164	NID_sha256WithRSAEncryption,	176	.pkey_type = NID_sha256WithRSAEncryption,
165	SHA256_DIGEST_LENGTH,	177	.md_size = SHA256_DIGEST_LENGTH,
166	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE\|EVP_MD_FLAG_DIGALGID_ABSENT,	178	.flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE\|EVP_MD_FLAG_DIGALGID_ABSENT,
167	init256,	179	.init = init256,
168	update256,	180	.update = update256,
169	final256,	181	.final = final256,
170	NULL,	182	.copy = NULL,
171	NULL,	183	.cleanup = NULL,
172	EVP_PKEY_RSA_method,	184	#ifndef OPENSSL_NO_RSA
173	SHA256_CBLOCK,	185	.sign = (evp_sign_method *)RSA_sign,
174	sizeof(EVP_MD *) + sizeof(SHA256_CTX),	186	.verify = (evp_verify_method *)RSA_verify,
		187	.required_pkey_type = {
		188	EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
		189	},
		190	#endif
		191	.block_size = SHA256_CBLOCK,
		192	.ctx_size = sizeof(EVP_MD *) + sizeof(SHA256_CTX),
175	};	193	};
176		194
177	const EVP_MD *	195	const EVP_MD *
@@ -207,18 +225,24 @@ final512(EVP_MD_CTX ctx, unsigned char md)
207	}	225	}
208		226
209	static const EVP_MD sha384_md = {	227	static const EVP_MD sha384_md = {
210	NID_sha384,	228	.type = NID_sha384,
211	NID_sha384WithRSAEncryption,	229	.pkey_type = NID_sha384WithRSAEncryption,
212	SHA384_DIGEST_LENGTH,	230	.md_size = SHA384_DIGEST_LENGTH,
213	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE\|EVP_MD_FLAG_DIGALGID_ABSENT,	231	.flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE\|EVP_MD_FLAG_DIGALGID_ABSENT,
214	init384,	232	.init = init384,
215	update512,	233	.update = update512,
216	final512,	234	.final = final512,
217	NULL,	235	.copy = NULL,
218	NULL,	236	.cleanup = NULL,
219	EVP_PKEY_RSA_method,	237	#ifndef OPENSSL_NO_RSA
220	SHA512_CBLOCK,	238	.sign = (evp_sign_method *)RSA_sign,
221	sizeof(EVP_MD *) + sizeof(SHA512_CTX),	239	.verify = (evp_verify_method *)RSA_verify,
		240	.required_pkey_type = {
		241	EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
		242	},
		243	#endif
		244	.block_size = SHA512_CBLOCK,
		245	.ctx_size = sizeof(EVP_MD *) + sizeof(SHA512_CTX),
222	};	246	};
223		247
224	const EVP_MD *	248	const EVP_MD *
@@ -228,18 +252,24 @@ EVP_sha384(void)
228	}	252	}
229		253
230	static const EVP_MD sha512_md = {	254	static const EVP_MD sha512_md = {
231	NID_sha512,	255	.type = NID_sha512,
232	NID_sha512WithRSAEncryption,	256	.pkey_type = NID_sha512WithRSAEncryption,
233	SHA512_DIGEST_LENGTH,	257	.md_size = SHA512_DIGEST_LENGTH,
234	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE\|EVP_MD_FLAG_DIGALGID_ABSENT,	258	.flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE\|EVP_MD_FLAG_DIGALGID_ABSENT,
235	init512,	259	.init = init512,
236	update512,	260	.update = update512,
237	final512,	261	.final = final512,
238	NULL,	262	.copy = NULL,
239	NULL,	263	.cleanup = NULL,
240	EVP_PKEY_RSA_method,	264	#ifndef OPENSSL_NO_RSA
241	SHA512_CBLOCK,	265	.sign = (evp_sign_method *)RSA_sign,
242	sizeof(EVP_MD *) + sizeof(SHA512_CTX),	266	.verify = (evp_verify_method *)RSA_verify,
		267	.required_pkey_type = {
		268	EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
		269	},
		270	#endif
		271	.block_size = SHA512_CBLOCK,
		272	.ctx_size = sizeof(EVP_MD *) + sizeof(SHA512_CTX),
243	};	273	};
244		274
245	const EVP_MD *	275	const EVP_MD *