From d0a21970fdc0fbbfc7ad31bc135f5a8fde1d3d49 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 26 Nov 2022 16:08:57 +0000 Subject: Make internal header file names consistent Libcrypto currently has a mess of *_lcl.h, *_locl.h, and *_local.h names used for internal headers. Move all these headers we inherited from OpenSSL to *_local.h, reserving the name *_internal.h for our own code. Similarly, move dtls_locl.h and ssl_locl.h to dtls_local and ssl_local.h. constant_time_locl.h is moved to constant_time.h since it's special. Adjust all .c files in libcrypto, libssl and regress. The diff is mechanical with the exception of tls13_quic.c, where #include was fixed manually. discussed with jsing, no objection bcook --- src/lib/libcrypto/gost/gost2814789.c | 4 +- src/lib/libcrypto/gost/gost89_keywrap.c | 4 +- src/lib/libcrypto/gost/gost89_params.c | 4 +- src/lib/libcrypto/gost/gost89imit_ameth.c | 6 +- src/lib/libcrypto/gost/gost89imit_pmeth.c | 6 +- src/lib/libcrypto/gost/gost_asn1.c | 2 +- src/lib/libcrypto/gost/gost_local.h | 117 ++++++++++++++++++++++++++++ src/lib/libcrypto/gost/gost_locl.h | 117 ---------------------------- src/lib/libcrypto/gost/gostr341001.c | 8 +- src/lib/libcrypto/gost/gostr341001_ameth.c | 8 +- src/lib/libcrypto/gost/gostr341001_key.c | 4 +- src/lib/libcrypto/gost/gostr341001_params.c | 4 +- src/lib/libcrypto/gost/gostr341001_pmeth.c | 8 +- src/lib/libcrypto/gost/gostr341194.c | 4 +- src/lib/libcrypto/gost/streebog.c | 4 +- 15 files changed, 150 insertions(+), 150 deletions(-) create mode 100644 src/lib/libcrypto/gost/gost_local.h delete mode 100644 src/lib/libcrypto/gost/gost_locl.h (limited to 'src/lib/libcrypto/gost') diff --git a/src/lib/libcrypto/gost/gost2814789.c b/src/lib/libcrypto/gost/gost2814789.c index 0841a03b1e..1e0f17da43 100644 --- a/src/lib/libcrypto/gost/gost2814789.c +++ b/src/lib/libcrypto/gost/gost2814789.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gost2814789.c,v 1.7 2021/11/09 18:40:21 bcook Exp $ */ +/* $OpenBSD: gost2814789.c,v 1.8 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -58,7 +58,7 @@ #include #include -#include "gost_locl.h" +#include "gost_local.h" static inline unsigned int f(const GOST2814789_KEY *c, unsigned int x) diff --git a/src/lib/libcrypto/gost/gost89_keywrap.c b/src/lib/libcrypto/gost/gost89_keywrap.c index a754c4d56e..9bfc5b4ce8 100644 --- a/src/lib/libcrypto/gost/gost89_keywrap.c +++ b/src/lib/libcrypto/gost/gost89_keywrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gost89_keywrap.c,v 1.3 2014/11/09 19:28:44 miod Exp $ */ +/* $OpenBSD: gost89_keywrap.c,v 1.4 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -57,7 +57,7 @@ #include -#include "gost_locl.h" +#include "gost_local.h" static void key_diversify_crypto_pro(GOST2814789_KEY *ctx, const unsigned char *inputKey, diff --git a/src/lib/libcrypto/gost/gost89_params.c b/src/lib/libcrypto/gost/gost89_params.c index 35d8f62fe9..9c4a97ee6d 100644 --- a/src/lib/libcrypto/gost/gost89_params.c +++ b/src/lib/libcrypto/gost/gost89_params.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gost89_params.c,v 1.2 2014/11/09 23:06:52 miod Exp $ */ +/* $OpenBSD: gost89_params.c,v 1.3 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -57,7 +57,7 @@ #include #include -#include "gost_locl.h" +#include "gost_local.h" /* Substitution blocks from test examples for GOST R 34.11-94*/ static const gost_subst_block GostR3411_94_TestParamSet = { diff --git a/src/lib/libcrypto/gost/gost89imit_ameth.c b/src/lib/libcrypto/gost/gost89imit_ameth.c index 3fdfa3eef2..e300b52801 100644 --- a/src/lib/libcrypto/gost/gost89imit_ameth.c +++ b/src/lib/libcrypto/gost/gost89imit_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gost89imit_ameth.c,v 1.3 2021/12/12 21:30:14 tb Exp $ */ +/* $OpenBSD: gost89imit_ameth.c,v 1.4 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -54,8 +54,8 @@ #ifndef OPENSSL_NO_GOST #include -#include "asn1_locl.h" -#include "evp_locl.h" +#include "asn1_local.h" +#include "evp_local.h" static void mackey_free_gost(EVP_PKEY *pk) diff --git a/src/lib/libcrypto/gost/gost89imit_pmeth.c b/src/lib/libcrypto/gost/gost89imit_pmeth.c index 1959b36163..63b7ef59ee 100644 --- a/src/lib/libcrypto/gost/gost89imit_pmeth.c +++ b/src/lib/libcrypto/gost/gost89imit_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gost89imit_pmeth.c,v 1.4 2017/01/29 17:49:23 beck Exp $ */ +/* $OpenBSD: gost89imit_pmeth.c,v 1.5 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -59,8 +59,8 @@ #include #include /* For string_to_hex */ -#include "evp_locl.h" -#include "gost_locl.h" +#include "evp_local.h" +#include "gost_local.h" struct gost_mac_pmeth_data { EVP_MD *md; diff --git a/src/lib/libcrypto/gost/gost_asn1.c b/src/lib/libcrypto/gost/gost_asn1.c index 2652162777..d83ded55b1 100644 --- a/src/lib/libcrypto/gost/gost_asn1.c +++ b/src/lib/libcrypto/gost/gost_asn1.c @@ -14,7 +14,7 @@ #include #include -#include "gost_locl.h" +#include "gost_local.h" #include "gost_asn1.h" static const ASN1_TEMPLATE GOST_KEY_TRANSPORT_seq_tt[] = { diff --git a/src/lib/libcrypto/gost/gost_local.h b/src/lib/libcrypto/gost/gost_local.h new file mode 100644 index 0000000000..1b31f7446e --- /dev/null +++ b/src/lib/libcrypto/gost/gost_local.h @@ -0,0 +1,117 @@ +/* $OpenBSD: gost_local.h,v 1.1 2022/11/26 16:08:53 tb Exp $ */ +/* + * Copyright (c) 2014 Dmitry Eremin-Solenikov + * Copyright (c) 2005-2006 Cryptocom LTD + * + * 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 above 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 acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * openssl-core@openssl.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.openssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED 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 OpenSSL PROJECT OR + * ITS 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. + * ==================================================================== + */ + +#ifndef HEADER_GOST_LOCL_H +#define HEADER_GOST_LOCL_H + +#include +#include + +__BEGIN_HIDDEN_DECLS + +/* Internal representation of GOST substitution blocks */ +typedef struct { + unsigned char k8[16]; + unsigned char k7[16]; + unsigned char k6[16]; + unsigned char k5[16]; + unsigned char k4[16]; + unsigned char k3[16]; + unsigned char k2[16]; + unsigned char k1[16]; +} gost_subst_block; + +#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) +# define c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4) +# define l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4) +#else +#define c2l(c,l) (l =(((unsigned long)(*((c)++))) ), \ + l|=(((unsigned long)(*((c)++)))<< 8), \ + l|=(((unsigned long)(*((c)++)))<<16), \ + l|=(((unsigned long)(*((c)++)))<<24)) +#define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \ + *((c)++)=(unsigned char)(((l)>> 8)&0xff), \ + *((c)++)=(unsigned char)(((l)>>16)&0xff), \ + *((c)++)=(unsigned char)(((l)>>24)&0xff)) +#endif + +extern void Gost2814789_encrypt(const unsigned char *in, unsigned char *out, + const GOST2814789_KEY *key); +extern void Gost2814789_decrypt(const unsigned char *in, unsigned char *out, + const GOST2814789_KEY *key); +extern void Gost2814789_cryptopro_key_mesh(GOST2814789_KEY *key); + +/* GOST 28147-89 key wrapping */ +extern int gost_key_unwrap_crypto_pro(int nid, + const unsigned char *keyExchangeKey, const unsigned char *wrappedKey, + unsigned char *sessionKey); +extern int gost_key_wrap_crypto_pro(int nid, + const unsigned char *keyExchangeKey, const unsigned char *ukm, + const unsigned char *sessionKey, unsigned char *wrappedKey); +/* Pkey part */ +extern int gost2001_compute_public(GOST_KEY *ec); +extern ECDSA_SIG *gost2001_do_sign(BIGNUM *md, GOST_KEY *eckey); +extern int gost2001_do_verify(BIGNUM *md, ECDSA_SIG *sig, GOST_KEY *ec); +extern int gost2001_keygen(GOST_KEY *ec); +extern int VKO_compute_key(BIGNUM *X, BIGNUM *Y, const GOST_KEY *pkey, + GOST_KEY *priv_key, const BIGNUM *ukm); +extern BIGNUM *GOST_le2bn(const unsigned char *buf, size_t len, BIGNUM *bn); +extern int GOST_bn2le(BIGNUM *bn, unsigned char *buf, int len); + +/* GOST R 34.10 parameters */ +extern int GostR3410_get_md_digest(int nid); +extern int GostR3410_get_pk_digest(int nid); +extern int GostR3410_256_param_id(const char *value); +extern int GostR3410_512_param_id(const char *value); + +__END_HIDDEN_DECLS + +#endif diff --git a/src/lib/libcrypto/gost/gost_locl.h b/src/lib/libcrypto/gost/gost_locl.h deleted file mode 100644 index b2e2c1362a..0000000000 --- a/src/lib/libcrypto/gost/gost_locl.h +++ /dev/null @@ -1,117 +0,0 @@ -/* $OpenBSD: gost_locl.h,v 1.4 2016/12/21 15:49:29 jsing Exp $ */ -/* - * Copyright (c) 2014 Dmitry Eremin-Solenikov - * Copyright (c) 2005-2006 Cryptocom LTD - * - * 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 above 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 acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED 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 OpenSSL PROJECT OR - * ITS 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. - * ==================================================================== - */ - -#ifndef HEADER_GOST_LOCL_H -#define HEADER_GOST_LOCL_H - -#include -#include - -__BEGIN_HIDDEN_DECLS - -/* Internal representation of GOST substitution blocks */ -typedef struct { - unsigned char k8[16]; - unsigned char k7[16]; - unsigned char k6[16]; - unsigned char k5[16]; - unsigned char k4[16]; - unsigned char k3[16]; - unsigned char k2[16]; - unsigned char k1[16]; -} gost_subst_block; - -#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) -# define c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4) -# define l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4) -#else -#define c2l(c,l) (l =(((unsigned long)(*((c)++))) ), \ - l|=(((unsigned long)(*((c)++)))<< 8), \ - l|=(((unsigned long)(*((c)++)))<<16), \ - l|=(((unsigned long)(*((c)++)))<<24)) -#define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \ - *((c)++)=(unsigned char)(((l)>> 8)&0xff), \ - *((c)++)=(unsigned char)(((l)>>16)&0xff), \ - *((c)++)=(unsigned char)(((l)>>24)&0xff)) -#endif - -extern void Gost2814789_encrypt(const unsigned char *in, unsigned char *out, - const GOST2814789_KEY *key); -extern void Gost2814789_decrypt(const unsigned char *in, unsigned char *out, - const GOST2814789_KEY *key); -extern void Gost2814789_cryptopro_key_mesh(GOST2814789_KEY *key); - -/* GOST 28147-89 key wrapping */ -extern int gost_key_unwrap_crypto_pro(int nid, - const unsigned char *keyExchangeKey, const unsigned char *wrappedKey, - unsigned char *sessionKey); -extern int gost_key_wrap_crypto_pro(int nid, - const unsigned char *keyExchangeKey, const unsigned char *ukm, - const unsigned char *sessionKey, unsigned char *wrappedKey); -/* Pkey part */ -extern int gost2001_compute_public(GOST_KEY *ec); -extern ECDSA_SIG *gost2001_do_sign(BIGNUM *md, GOST_KEY *eckey); -extern int gost2001_do_verify(BIGNUM *md, ECDSA_SIG *sig, GOST_KEY *ec); -extern int gost2001_keygen(GOST_KEY *ec); -extern int VKO_compute_key(BIGNUM *X, BIGNUM *Y, const GOST_KEY *pkey, - GOST_KEY *priv_key, const BIGNUM *ukm); -extern BIGNUM *GOST_le2bn(const unsigned char *buf, size_t len, BIGNUM *bn); -extern int GOST_bn2le(BIGNUM *bn, unsigned char *buf, int len); - -/* GOST R 34.10 parameters */ -extern int GostR3410_get_md_digest(int nid); -extern int GostR3410_get_pk_digest(int nid); -extern int GostR3410_256_param_id(const char *value); -extern int GostR3410_512_param_id(const char *value); - -__END_HIDDEN_DECLS - -#endif diff --git a/src/lib/libcrypto/gost/gostr341001.c b/src/lib/libcrypto/gost/gostr341001.c index a6082568ff..13f053dae8 100644 --- a/src/lib/libcrypto/gost/gostr341001.c +++ b/src/lib/libcrypto/gost/gostr341001.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gostr341001.c,v 1.9 2022/01/07 09:40:03 tb Exp $ */ +/* $OpenBSD: gostr341001.c,v 1.10 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -58,9 +58,9 @@ #include #include -#include "bn_lcl.h" -#include "ecs_locl.h" -#include "gost_locl.h" +#include "bn_local.h" +#include "ecs_local.h" +#include "gost_local.h" /* Convert little-endian byte array into bignum */ BIGNUM * diff --git a/src/lib/libcrypto/gost/gostr341001_ameth.c b/src/lib/libcrypto/gost/gostr341001_ameth.c index ce203a6c21..9ef7cdf461 100644 --- a/src/lib/libcrypto/gost/gostr341001_ameth.c +++ b/src/lib/libcrypto/gost/gostr341001_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gostr341001_ameth.c,v 1.19 2021/12/26 15:38:49 tb Exp $ */ +/* $OpenBSD: gostr341001_ameth.c,v 1.20 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -62,9 +62,9 @@ #include -#include "asn1_locl.h" -#include "evp_locl.h" -#include "gost_locl.h" +#include "asn1_local.h" +#include "evp_local.h" +#include "gost_local.h" #include "gost_asn1.h" static void diff --git a/src/lib/libcrypto/gost/gostr341001_key.c b/src/lib/libcrypto/gost/gostr341001_key.c index d5d885c257..af3a3fcd38 100644 --- a/src/lib/libcrypto/gost/gostr341001_key.c +++ b/src/lib/libcrypto/gost/gostr341001_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gostr341001_key.c,v 1.9 2021/04/20 17:16:38 tb Exp $ */ +/* $OpenBSD: gostr341001_key.c,v 1.10 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -58,7 +58,7 @@ #include #include #include -#include "gost_locl.h" +#include "gost_local.h" struct gost_key_st { EC_GROUP *group; diff --git a/src/lib/libcrypto/gost/gostr341001_params.c b/src/lib/libcrypto/gost/gostr341001_params.c index 282a210419..ca8a27d712 100644 --- a/src/lib/libcrypto/gost/gostr341001_params.c +++ b/src/lib/libcrypto/gost/gostr341001_params.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gostr341001_params.c,v 1.4 2020/06/05 17:12:09 jsing Exp $ */ +/* $OpenBSD: gostr341001_params.c,v 1.5 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -57,7 +57,7 @@ #include #include -#include "gost_locl.h" +#include "gost_local.h" int GostR3410_get_md_digest(int nid) diff --git a/src/lib/libcrypto/gost/gostr341001_pmeth.c b/src/lib/libcrypto/gost/gostr341001_pmeth.c index ae39b05901..38f94ecd81 100644 --- a/src/lib/libcrypto/gost/gostr341001_pmeth.c +++ b/src/lib/libcrypto/gost/gostr341001_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gostr341001_pmeth.c,v 1.16 2022/03/30 07:17:48 tb Exp $ */ +/* $OpenBSD: gostr341001_pmeth.c,v 1.17 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -62,9 +62,9 @@ #include #include -#include "ecs_locl.h" -#include "evp_locl.h" -#include "gost_locl.h" +#include "ecs_local.h" +#include "evp_local.h" +#include "gost_local.h" #include "gost_asn1.h" static ECDSA_SIG * diff --git a/src/lib/libcrypto/gost/gostr341194.c b/src/lib/libcrypto/gost/gostr341194.c index 2a462185aa..63058300a3 100644 --- a/src/lib/libcrypto/gost/gostr341194.c +++ b/src/lib/libcrypto/gost/gostr341194.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gostr341194.c,v 1.5 2015/09/10 15:56:25 jsing Exp $ */ +/* $OpenBSD: gostr341194.c,v 1.6 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -58,7 +58,7 @@ #include #include -#include "gost_locl.h" +#include "gost_local.h" /* Following functions are various bit meshing routines used in * GOST R 34.11-94 algorithms */ diff --git a/src/lib/libcrypto/gost/streebog.c b/src/lib/libcrypto/gost/streebog.c index b237a2c500..2785fca619 100644 --- a/src/lib/libcrypto/gost/streebog.c +++ b/src/lib/libcrypto/gost/streebog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: streebog.c,v 1.7 2021/11/09 18:40:21 bcook Exp $ */ +/* $OpenBSD: streebog.c,v 1.8 2022/11/26 16:08:53 tb Exp $ */ /* * Copyright (c) 2014 Dmitry Eremin-Solenikov * Copyright (c) 2005-2006 Cryptocom LTD @@ -60,7 +60,7 @@ #include #include -#include "gost_locl.h" +#include "gost_local.h" static const STREEBOG_LONG64 A_PI_table[8][256] = { { /* 0 */ -- cgit v1.2.3-55-g6feb