summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lib/libcrypto/Makefile3
-rw-r--r--src/lib/libcrypto/err/err_all.c5
-rw-r--r--src/lib/libcrypto/evp/m_streebog.c133
-rw-r--r--src/lib/libcrypto/hidden/openssl/gost.h71
4 files changed, 2 insertions, 210 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 5ef55c6b6c..06bb1ec6bd 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.173 2024/03/02 11:17:27 tb Exp $ 1# $OpenBSD: Makefile,v 1.174 2024/03/02 13:39:28 tb Exp $
2 2
3LIB= crypto 3LIB= crypto
4LIBREBUILD=y 4LIBREBUILD=y
@@ -381,7 +381,6 @@ SRCS+= m_sha1.c
381SRCS+= m_sha3.c 381SRCS+= m_sha3.c
382SRCS+= m_sigver.c 382SRCS+= m_sigver.c
383SRCS+= m_sm3.c 383SRCS+= m_sm3.c
384SRCS+= m_streebog.c
385SRCS+= m_wp.c 384SRCS+= m_wp.c
386SRCS+= p_legacy.c 385SRCS+= p_legacy.c
387SRCS+= p_lib.c 386SRCS+= p_lib.c
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
index 4829e46a1a..56276abb0d 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: err_all.c,v 1.33 2023/11/19 15:46:09 tb Exp $ */ 1/* $OpenBSD: err_all.c,v 1.34 2024/03/02 13:39:28 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -94,9 +94,6 @@
94#ifndef OPENSSL_NO_RSA 94#ifndef OPENSSL_NO_RSA
95#include <openssl/rsa.h> 95#include <openssl/rsa.h>
96#endif 96#endif
97#ifndef OPENSSL_NO_GOST
98#include <openssl/gost.h>
99#endif
100 97
101void ERR_load_ERR_strings_internal(void); 98void ERR_load_ERR_strings_internal(void);
102 99
diff --git a/src/lib/libcrypto/evp/m_streebog.c b/src/lib/libcrypto/evp/m_streebog.c
deleted file mode 100644
index 48fa65864e..0000000000
--- a/src/lib/libcrypto/evp/m_streebog.c
+++ /dev/null
@@ -1,133 +0,0 @@
1/* $OpenBSD: m_streebog.c,v 1.7 2023/07/07 19:37:54 beck Exp $ */
2/*
3 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4 * Copyright (c) 2005-2006 Cryptocom LTD
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 *
10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in
15 * the documentation and/or other materials provided with the
16 * distribution.
17 *
18 * 3. All advertising materials mentioning features or use of this
19 * software must display the following acknowledgment:
20 * "This product includes software developed by the OpenSSL Project
21 * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
22 *
23 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
24 * endorse or promote products derived from this software without
25 * prior written permission. For written permission, please contact
26 * openssl-core@openssl.org.
27 *
28 * 5. Products derived from this software may not be called "OpenSSL"
29 * nor may "OpenSSL" appear in their names without prior written
30 * permission of the OpenSSL Project.
31 *
32 * 6. Redistributions of any form whatsoever must retain the following
33 * acknowledgment:
34 * "This product includes software developed by the OpenSSL Project
35 * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
36 *
37 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
38 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
39 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
40 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
41 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
42 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
43 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
44 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
45 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
46 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
47 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
48 * OF THE POSSIBILITY OF SUCH DAMAGE.
49 * ====================================================================
50 */
51
52#include <openssl/opensslconf.h>
53
54#ifndef OPENSSL_NO_GOST
55
56#include <openssl/evp.h>
57#include <openssl/gost.h>
58#include <openssl/objects.h>
59
60#include "evp_local.h"
61
62static int
63streebog_init256(EVP_MD_CTX *ctx)
64{
65 return STREEBOG256_Init(ctx->md_data);
66}
67
68static int
69streebog_update256(EVP_MD_CTX *ctx, const void *data, size_t count)
70{
71 return STREEBOG256_Update(ctx->md_data, data, count);
72}
73
74static int
75streebog_final256(EVP_MD_CTX *ctx, unsigned char *md)
76{
77 return STREEBOG256_Final(md, ctx->md_data);
78}
79
80static int
81streebog_init512(EVP_MD_CTX *ctx)
82{
83 return STREEBOG512_Init(ctx->md_data);
84}
85
86static int
87streebog_update512(EVP_MD_CTX *ctx, const void *data, size_t count)
88{
89 return STREEBOG512_Update(ctx->md_data, data, count);
90}
91
92static int
93streebog_final512(EVP_MD_CTX *ctx, unsigned char *md)
94{
95 return STREEBOG512_Final(md, ctx->md_data);
96}
97
98static const EVP_MD streebog256_md = {
99 .type = NID_id_tc26_gost3411_2012_256,
100 .pkey_type = NID_undef,
101 .md_size = STREEBOG256_LENGTH,
102 .flags = 0,
103 .init = streebog_init256,
104 .update = streebog_update256,
105 .final = streebog_final256,
106 .block_size = STREEBOG_CBLOCK,
107 .ctx_size = sizeof(EVP_MD *) + sizeof(STREEBOG_CTX),
108};
109
110static const EVP_MD streebog512_md = {
111 .type = NID_id_tc26_gost3411_2012_512,
112 .pkey_type = NID_undef,
113 .md_size = STREEBOG512_LENGTH,
114 .flags = 0,
115 .init = streebog_init512,
116 .update = streebog_update512,
117 .final = streebog_final512,
118 .block_size = STREEBOG_CBLOCK,
119 .ctx_size = sizeof(EVP_MD *) + sizeof(STREEBOG_CTX),
120};
121
122const EVP_MD *
123EVP_streebog256(void)
124{
125 return (&streebog256_md);
126}
127
128const EVP_MD *
129EVP_streebog512(void)
130{
131 return (&streebog512_md);
132}
133#endif
diff --git a/src/lib/libcrypto/hidden/openssl/gost.h b/src/lib/libcrypto/hidden/openssl/gost.h
deleted file mode 100644
index e30e6611af..0000000000
--- a/src/lib/libcrypto/hidden/openssl/gost.h
+++ /dev/null
@@ -1,71 +0,0 @@
1/* $OpenBSD: gost.h,v 1.1 2023/07/08 14:30:44 beck Exp $ */
2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */
17
18#ifndef _LIBCRYPTO_GOST_H
19#define _LIBCRYPTO_GOST_H
20
21#ifndef _MSC_VER
22#include_next <openssl/gost.h>
23#else
24#include "../include/openssl/gost.h"
25#endif
26#include "crypto_namespace.h"
27
28LCRYPTO_USED(Gost2814789_set_sbox);
29LCRYPTO_USED(Gost2814789_set_key);
30LCRYPTO_USED(Gost2814789_ecb_encrypt);
31LCRYPTO_USED(Gost2814789_cfb64_encrypt);
32LCRYPTO_USED(Gost2814789_cnt_encrypt);
33LCRYPTO_USED(GOST_CIPHER_PARAMS_new);
34LCRYPTO_USED(GOST_CIPHER_PARAMS_free);
35LCRYPTO_USED(d2i_GOST_CIPHER_PARAMS);
36LCRYPTO_USED(i2d_GOST_CIPHER_PARAMS);
37LCRYPTO_USED(GOST2814789IMIT_Init);
38LCRYPTO_USED(GOST2814789IMIT_Update);
39LCRYPTO_USED(GOST2814789IMIT_Final);
40LCRYPTO_USED(GOST2814789IMIT_Transform);
41LCRYPTO_USED(GOST2814789IMIT);
42LCRYPTO_USED(GOSTR341194_Init);
43LCRYPTO_USED(GOSTR341194_Update);
44LCRYPTO_USED(GOSTR341194_Final);
45LCRYPTO_USED(GOSTR341194_Transform);
46LCRYPTO_USED(GOSTR341194);
47LCRYPTO_USED(STREEBOG256_Init);
48LCRYPTO_USED(STREEBOG256_Update);
49LCRYPTO_USED(STREEBOG256_Final);
50LCRYPTO_USED(STREEBOG256);
51LCRYPTO_USED(STREEBOG512_Init);
52LCRYPTO_USED(STREEBOG512_Update);
53LCRYPTO_USED(STREEBOG512_Final);
54LCRYPTO_USED(STREEBOG512_Transform);
55LCRYPTO_USED(STREEBOG512);
56LCRYPTO_USED(GOST_KEY_new);
57LCRYPTO_USED(GOST_KEY_free);
58LCRYPTO_USED(GOST_KEY_check_key);
59LCRYPTO_USED(GOST_KEY_set_public_key_affine_coordinates);
60LCRYPTO_USED(GOST_KEY_get0_group);
61LCRYPTO_USED(GOST_KEY_set_group);
62LCRYPTO_USED(GOST_KEY_get_digest);
63LCRYPTO_USED(GOST_KEY_set_digest);
64LCRYPTO_USED(GOST_KEY_get0_private_key);
65LCRYPTO_USED(GOST_KEY_set_private_key);
66LCRYPTO_USED(GOST_KEY_get0_public_key);
67LCRYPTO_USED(GOST_KEY_set_public_key);
68LCRYPTO_USED(GOST_KEY_get_size);
69LCRYPTO_USED(ERR_load_GOST_strings);
70
71#endif /* _LIBCRYPTO_GOST_H */
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 17:33:05 +0000