From 636d4f5acd82a8c8e02b053acccc9cf0862fcace Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Sat, 4 Dec 2021 16:08:32 +0000
Subject: [PATCH] Add #include "bn_lcl.h" to the files that will soon need it.

ok inoguchi jsing
---
 lib/libcrypto/asn1/t_pkey.c    | 4 +++-
 lib/libcrypto/dh/dh_depr.c     | 4 +++-
 lib/libcrypto/dh/dh_pmeth.c    | 3 ++-
 lib/libcrypto/dsa/dsa_depr.c   | 4 +++-
 lib/libcrypto/dsa/dsa_pmeth.c  | 3 ++-
 lib/libcrypto/ec/ec_kmeth.c    | 3 ++-
 lib/libcrypto/ec/ec_lcl.h      | 4 +++-
 lib/libcrypto/ec/ec_pmeth.c    | 3 ++-
 lib/libcrypto/ecdh/ech_key.c   | 3 ++-
 lib/libcrypto/ecdsa/ecs_sign.c | 3 ++-
 lib/libcrypto/ecdsa/ecs_vrf.c  | 4 +++-
 lib/libcrypto/evp/pmeth_gn.c   | 3 ++-
 lib/libcrypto/rsa/rsa_depr.c   | 4 +++-
 lib/libcrypto/rsa/rsa_pmeth.c  | 3 ++-
 lib/libcrypto/ts/ts_lib.c      | 3 ++-
 15 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/lib/libcrypto/asn1/t_pkey.c b/lib/libcrypto/asn1/t_pkey.c
index b3f7d084c54..a3073812313 100644
--- a/lib/libcrypto/asn1/t_pkey.c
+++ b/lib/libcrypto/asn1/t_pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t_pkey.c,v 1.16 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: t_pkey.c,v 1.17 2021/12/04 16:08:32 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,6 +62,8 @@
 #include <openssl/buffer.h>
 #include <openssl/objects.h>
 
+#include "bn_lcl.h"
+
 int
 ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
     unsigned char *buf, int off)
diff --git a/lib/libcrypto/dh/dh_depr.c b/lib/libcrypto/dh/dh_depr.c
index 0b75b0be5e1..717482ca387 100644
--- a/lib/libcrypto/dh/dh_depr.c
+++ b/lib/libcrypto/dh/dh_depr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_depr.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: dh_depr.c,v 1.7 2021/12/04 16:08:32 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -62,6 +62,8 @@
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 
+#include "bn_lcl.h"
+
 #ifndef OPENSSL_NO_DEPRECATED
 DH *
 DH_generate_parameters(int prime_len, int generator,
diff --git a/lib/libcrypto/dh/dh_pmeth.c b/lib/libcrypto/dh/dh_pmeth.c
index 24d16ff5d3c..0dda6bb1f7a 100644
--- a/lib/libcrypto/dh/dh_pmeth.c
+++ b/lib/libcrypto/dh/dh_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_pmeth.c,v 1.10 2017/01/29 17:49:22 beck Exp $ */
+/* $OpenBSD: dh_pmeth.c,v 1.11 2021/12/04 16:08:32 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -67,6 +67,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
+#include "bn_lcl.h"
 #include "evp_locl.h"
 
 /* DH pkey context structure */
diff --git a/lib/libcrypto/dsa/dsa_depr.c b/lib/libcrypto/dsa/dsa_depr.c
index 269cd634507..673e7000a0e 100644
--- a/lib/libcrypto/dsa/dsa_depr.c
+++ b/lib/libcrypto/dsa/dsa_depr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_depr.c,v 1.7 2014/10/18 17:20:40 jsing Exp $ */
+/* $OpenBSD: dsa_depr.c,v 1.8 2021/12/04 16:08:32 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -68,6 +68,8 @@
 #include <openssl/evp.h>
 #include <openssl/sha.h>
 
+#include "bn_lcl.h"
+
 #ifndef OPENSSL_NO_DEPRECATED
 DSA *
 DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len,
diff --git a/lib/libcrypto/dsa/dsa_pmeth.c b/lib/libcrypto/dsa/dsa_pmeth.c
index dd0da348b68..ef89e2be33d 100644
--- a/lib/libcrypto/dsa/dsa_pmeth.c
+++ b/lib/libcrypto/dsa/dsa_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_pmeth.c,v 1.12 2019/09/09 18:06:25 jsing Exp $ */
+/* $OpenBSD: dsa_pmeth.c,v 1.13 2021/12/04 16:08:32 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -66,6 +66,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
+#include "bn_lcl.h"
 #include "dsa_locl.h"
 #include "evp_locl.h"
 
diff --git a/lib/libcrypto/ec/ec_kmeth.c b/lib/libcrypto/ec/ec_kmeth.c
index 1fb9e57f32f..4203dff2d06 100644
--- a/lib/libcrypto/ec/ec_kmeth.c
+++ b/lib/libcrypto/ec/ec_kmeth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ec_kmeth.c,v 1.5 2019/05/10 19:15:06 bcook Exp $	*/
+/*	$OpenBSD: ec_kmeth.c,v 1.6 2021/12/04 16:08:32 tb Exp $	*/
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -58,6 +58,7 @@
 #endif
 #include <openssl/err.h>
 
+#include "bn_lcl.h"
 #include "ec_lcl.h"
 #include "ecs_locl.h"
 
diff --git a/lib/libcrypto/ec/ec_lcl.h b/lib/libcrypto/ec/ec_lcl.h
index ced04c7e314..7a7469968c4 100644
--- a/lib/libcrypto/ec/ec_lcl.h
+++ b/lib/libcrypto/ec/ec_lcl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_lcl.h,v 1.18 2021/09/08 17:29:21 tb Exp $ */
+/* $OpenBSD: ec_lcl.h,v 1.19 2021/12/04 16:08:32 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -76,6 +76,8 @@
 #include <openssl/ecdsa.h>
 #include <openssl/bn.h>
 
+#include "bn_lcl.h"
+
 __BEGIN_HIDDEN_DECLS
 
 #if defined(__SUNPRO_C)
diff --git a/lib/libcrypto/ec/ec_pmeth.c b/lib/libcrypto/ec/ec_pmeth.c
index c57d26ae29f..63e63592519 100644
--- a/lib/libcrypto/ec/ec_pmeth.c
+++ b/lib/libcrypto/ec/ec_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_pmeth.c,v 1.12 2019/09/09 18:06:25 jsing Exp $ */
+/* $OpenBSD: ec_pmeth.c,v 1.13 2021/12/04 16:08:32 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -66,6 +66,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
+#include "bn_lcl.h"
 #include "ec_lcl.h"
 #include "ech_locl.h"
 #include "evp_locl.h"
diff --git a/lib/libcrypto/ecdh/ech_key.c b/lib/libcrypto/ecdh/ech_key.c
index e59ce8bc3c0..797cb01891b 100644
--- a/lib/libcrypto/ecdh/ech_key.c
+++ b/lib/libcrypto/ecdh/ech_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ech_key.c,v 1.11 2021/04/20 17:23:37 tb Exp $ */
+/* $OpenBSD: ech_key.c,v 1.12 2021/12/04 16:08:32 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -77,6 +77,7 @@
 #include <openssl/obj_mac.h>
 #include <openssl/sha.h>
 
+#include "bn_lcl.h"
 #include "ech_locl.h"
 #include "ec_lcl.h"
 
diff --git a/lib/libcrypto/ecdsa/ecs_sign.c b/lib/libcrypto/ecdsa/ecs_sign.c
index 5beb853b94a..54c99638da6 100644
--- a/lib/libcrypto/ecdsa/ecs_sign.c
+++ b/lib/libcrypto/ecdsa/ecs_sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecs_sign.c,v 1.7 2019/01/19 01:07:00 tb Exp $ */
+/* $OpenBSD: ecs_sign.c,v 1.8 2021/12/04 16:08:32 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -59,6 +59,7 @@
 #include <openssl/engine.h>
 #endif
 
+#include "bn_lcl.h"
 #include "ecs_locl.h"
 #include "ec_lcl.h"
 
diff --git a/lib/libcrypto/ecdsa/ecs_vrf.c b/lib/libcrypto/ecdsa/ecs_vrf.c
index 4c1bc85e068..def130cf5cb 100644
--- a/lib/libcrypto/ecdsa/ecs_vrf.c
+++ b/lib/libcrypto/ecdsa/ecs_vrf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecs_vrf.c,v 1.7 2019/01/19 01:12:48 tb Exp $ */
+/* $OpenBSD: ecs_vrf.c,v 1.8 2021/12/04 16:08:32 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project
  */
@@ -58,8 +58,10 @@
 
 #include <openssl/opensslconf.h>
 
+#include "bn_lcl.h"
 #include "ecs_locl.h"
 #include "ec_lcl.h"
+
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
diff --git a/lib/libcrypto/evp/pmeth_gn.c b/lib/libcrypto/evp/pmeth_gn.c
index 7f5311aff9f..066291b8007 100644
--- a/lib/libcrypto/evp/pmeth_gn.c
+++ b/lib/libcrypto/evp/pmeth_gn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmeth_gn.c,v 1.7 2021/11/18 18:05:27 tb Exp $ */
+/* $OpenBSD: pmeth_gn.c,v 1.8 2021/12/04 16:08:32 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -64,6 +64,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 
+#include "bn_lcl.h"
 #include "evp_locl.h"
 
 int
diff --git a/lib/libcrypto/rsa/rsa_depr.c b/lib/libcrypto/rsa/rsa_depr.c
index b830a2293c4..54a669ccc21 100644
--- a/lib/libcrypto/rsa/rsa_depr.c
+++ b/lib/libcrypto/rsa/rsa_depr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_depr.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: rsa_depr.c,v 1.9 2021/12/04 16:08:32 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -64,6 +64,8 @@
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 
+#include "bn_lcl.h"
+
 #ifndef OPENSSL_NO_DEPRECATED
 
 RSA *
diff --git a/lib/libcrypto/rsa/rsa_pmeth.c b/lib/libcrypto/rsa/rsa_pmeth.c
index 008d425bd11..36a2a27727b 100644
--- a/lib/libcrypto/rsa/rsa_pmeth.c
+++ b/lib/libcrypto/rsa/rsa_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_pmeth.c,v 1.32 2019/10/31 14:05:30 jsing Exp $ */
+/* $OpenBSD: rsa_pmeth.c,v 1.33 2021/12/04 16:08:32 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -70,6 +70,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
+#include "bn_lcl.h"
 #include "evp_locl.h"
 #include "rsa_locl.h"
 
diff --git a/lib/libcrypto/ts/ts_lib.c b/lib/libcrypto/ts/ts_lib.c
index cdfa9db3510..b6d50a36fa4 100644
--- a/lib/libcrypto/ts/ts_lib.c
+++ b/lib/libcrypto/ts/ts_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_lib.c,v 1.11 2021/11/01 20:53:08 tb Exp $ */
+/* $OpenBSD: ts_lib.c,v 1.12 2021/12/04 16:08:32 tb Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -64,6 +64,7 @@
 #include <openssl/ts.h>
 #include <openssl/x509v3.h>
 
+#include "bn_lcl.h"
 #include "x509_lcl.h"
 
 /* Local function declarations. */
-- 
2.20.1