1 files changed, 0 insertions, 119 deletions
diff --git a/src/lib/libcrypto/evp/p_verify.c b/src/lib/libcrypto/evp/p_verify.c
deleted file mode 100644
index e653fcf6a5..0000000000
--- a/src/lib/libcrypto/evp/p_verify.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* $OpenBSD: p_verify.c,v 1.12 2014/07/11 08:44:48 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:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     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
- *    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
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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
- * [including the GNU Public Licence.]
- */
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-int
-EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
-    unsigned int siglen, EVP_PKEY *pkey)
-{
-        unsigned char m[EVP_MAX_MD_SIZE];
-        unsigned int m_len;
-        int i = 0, ok = 0, v;
-        EVP_MD_CTX tmp_ctx;
-        EVP_PKEY_CTX *pkctx = NULL;
-        EVP_MD_CTX_init(&tmp_ctx);
-        if (!EVP_MD_CTX_copy_ex(&tmp_ctx, ctx))
-                goto err;
-        if (!EVP_DigestFinal_ex(&tmp_ctx, &(m[0]), &m_len))
-                goto err;
-        EVP_MD_CTX_cleanup(&tmp_ctx);
-        if (ctx->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) {
-                i = -1;
-                pkctx = EVP_PKEY_CTX_new(pkey, NULL);
-                if (!pkctx)
-                        goto err;
-                if (EVP_PKEY_verify_init(pkctx) <= 0)
-                        goto err;
-                if (EVP_PKEY_CTX_set_signature_md(pkctx, ctx->digest) <= 0)
-                        goto err;
-                i = EVP_PKEY_verify(pkctx, sigbuf, siglen, m, m_len);
-err:
-                EVP_PKEY_CTX_free(pkctx);
-                return i;
-        }
-        for (i = 0; i < 4; i++) {
-                v = ctx->digest->required_pkey_type[i];
-                if (v == 0)
-                        break;
-                if (pkey->type == v) {
-                        ok = 1;
-                        break;
-                }
-        }
-        if (!ok) {
-                EVPerr(EVP_F_EVP_VERIFYFINAL, EVP_R_WRONG_PUBLIC_KEY_TYPE);
-                return (-1);
-        }
-        if (ctx->digest->verify == NULL) {
-                EVPerr(EVP_F_EVP_VERIFYFINAL,
-                    EVP_R_NO_VERIFY_FUNCTION_CONFIGURED);
-                return (0);
-        }
-        return(ctx->digest->verify(ctx->digest->type, m, m_len,
-            sigbuf, siglen, pkey->pkey.ptr));
-}

diff --git a/src/lib/libcrypto/evp/p_verify.c b/src/lib/libcrypto/evp/p_verify.c deleted file mode 100644 index e653fcf6a5..0000000000 --- a/src/lib/libcrypto/evp/p_verify.c +++ /dev/null
@@ -1,119 +0,0 @@
1	/* $OpenBSD: p_verify.c,v 1.12 2014/07/11 08:44:48 jsing Exp $ */
2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3	* All rights reserved.
4	*
5	* This package is an SSL implementation written
6	* by Eric Young (eay@cryptsoft.com).
7	* The implementation was written so as to conform with Netscapes SSL.
8	*
9	* This library is free for commercial and non-commercial use as long as
10	* the following conditions are aheared to. The following conditions
11	* apply to all code found in this distribution, be it the RC4, RSA,
12	* lhash, DES, etc., code; not just the SSL code. The SSL documentation
13	* included with this distribution is covered by the same copyright terms
14	* except that the holder is Tim Hudson (tjh@cryptsoft.com).
15	*
16	* Copyright remains Eric Young's, and as such any Copyright notices in
17	* the code are not to be removed.
18	* If this package is used in a product, Eric Young should be given attribution
19	* as the author of the parts of the library used.
20	* This can be in the form of a textual message at program startup or
21	* in documentation (online or textual) provided with the package.
22	*
23	* Redistribution and use in source and binary forms, with or without
24	* modification, are permitted provided that the following conditions
25	* are met:
26	* 1. Redistributions of source code must retain the copyright
27	* notice, this list of conditions and the following disclaimer.
28	* 2. Redistributions in binary form must reproduce the above copyright
29	* notice, this list of conditions and the following disclaimer in the
30	* documentation and/or other materials provided with the distribution.
31	* 3. All advertising materials mentioning features or use of this software
32	* must display the following acknowledgement:
33	* "This product includes cryptographic software written by
34	* Eric Young (eay@cryptsoft.com)"
35	* The word 'cryptographic' can be left out if the rouines from the library
36	* being used are not cryptographic related :-).
37	* 4. If you include any Windows specific code (or a derivative thereof) from
38	* the apps directory (application code) you must include an acknowledgement:
39	* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40	*
41	* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51	* SUCH DAMAGE.
52	*
53	* The licence and distribution terms for any publically available version or
54	* derivative of this code cannot be changed. i.e. this code cannot simply be
55	* copied and put under another distribution licence
56	* [including the GNU Public Licence.]
57	*/
58
59	#include <stdio.h>
60
61	#include <openssl/err.h>
62	#include <openssl/evp.h>
63	#include <openssl/objects.h>
64	#include <openssl/x509.h>
65
66	int
67	EVP_VerifyFinal(EVP_MD_CTX ctx, const unsigned char sigbuf,
68	unsigned int siglen, EVP_PKEY *pkey)
69	{
70	unsigned char m[EVP_MAX_MD_SIZE];
71	unsigned int m_len;
72	int i = 0, ok = 0, v;
73	EVP_MD_CTX tmp_ctx;
74	EVP_PKEY_CTX *pkctx = NULL;
75
76	EVP_MD_CTX_init(&tmp_ctx);
77	if (!EVP_MD_CTX_copy_ex(&tmp_ctx, ctx))
78	goto err;
79	if (!EVP_DigestFinal_ex(&tmp_ctx, &(m[0]), &m_len))
80	goto err;
81	EVP_MD_CTX_cleanup(&tmp_ctx);
82
83	if (ctx->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) {
84	i = -1;
85	pkctx = EVP_PKEY_CTX_new(pkey, NULL);
86	if (!pkctx)
87	goto err;
88	if (EVP_PKEY_verify_init(pkctx) <= 0)
89	goto err;
90	if (EVP_PKEY_CTX_set_signature_md(pkctx, ctx->digest) <= 0)
91	goto err;
92	i = EVP_PKEY_verify(pkctx, sigbuf, siglen, m, m_len);
93	err:
94	EVP_PKEY_CTX_free(pkctx);
95	return i;
96	}
97
98	for (i = 0; i < 4; i++) {
99	v = ctx->digest->required_pkey_type[i];
100	if (v == 0)
101	break;
102	if (pkey->type == v) {
103	ok = 1;
104	break;
105	}
106	}
107	if (!ok) {
108	EVPerr(EVP_F_EVP_VERIFYFINAL, EVP_R_WRONG_PUBLIC_KEY_TYPE);
109	return (-1);
110	}
111	if (ctx->digest->verify == NULL) {
112	EVPerr(EVP_F_EVP_VERIFYFINAL,
113	EVP_R_NO_VERIFY_FUNCTION_CONFIGURED);
114	return (0);
115	}
116
117	return(ctx->digest->verify(ctx->digest->type, m, m_len,
118	sigbuf, siglen, pkey->pkey.ptr));
119	}