[openssh-commits] [openssh] branch master updated: upstream: include openssl/bn.h explicitly in files where we use BN_*
git+noreply at mindrot.org
git+noreply at mindrot.org
Fri Oct 3 10:12:20 AEST 2025
This is an automated email from the git hooks/post-receive script.
djm pushed a commit to branch master
in repository openssh.
The following commit(s) were added to refs/heads/master by this push:
new a9cbe10da upstream: include openssl/bn.h explicitly in files where we use BN_*
a9cbe10da is described below
commit a9cbe10da2be5be76755af0cea029db0f9c1f263
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Fri Oct 3 00:08:02 2025 +0000
upstream: include openssl/bn.h explicitly in files where we use BN_*
makes things simpler for portable; from Mike Frysinger
OpenBSD-Commit-ID: 717e93403fd1108e175afd7451b5a4ab46a598fe
---
kexdh.c | 3 ++-
kexecdh.c | 3 ++-
kexgexc.c | 6 +++---
kexgexs.c | 6 +++---
openbsd-compat/openssl-compat.h | 1 +
ssh-keygen.c | 5 +++--
ssh-pkcs11.c | 4 +++-
ssh-rsa.c | 6 +++---
sshkey.c | 3 ++-
9 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/kexdh.c b/kexdh.c
index c1084f214..191bdced0 100644
--- a/kexdh.c
+++ b/kexdh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdh.c,v 1.34 2020/12/04 02:29:25 djm Exp $ */
+/* $OpenBSD: kexdh.c,v 1.35 2025/10/03 00:08:02 djm Exp $ */
/*
* Copyright (c) 2019 Markus Friedl. All rights reserved.
*
@@ -34,6 +34,7 @@
#include <signal.h>
#include "openbsd-compat/openssl-compat.h"
+#include <openssl/bn.h>
#include <openssl/dh.h>
#include "sshkey.h"
diff --git a/kexecdh.c b/kexecdh.c
index efb2e55a6..500ec5725 100644
--- a/kexecdh.c
+++ b/kexecdh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexecdh.c,v 1.10 2019/01/21 10:40:11 djm Exp $ */
+/* $OpenBSD: kexecdh.c,v 1.11 2025/10/03 00:08:02 djm Exp $ */
/*
* Copyright (c) 2010 Damien Miller. All rights reserved.
* Copyright (c) 2019 Markus Friedl. All rights reserved.
@@ -34,6 +34,7 @@
#include <string.h>
#include <signal.h>
+#include <openssl/bn.h>
#include <openssl/ecdh.h>
#include "sshkey.h"
diff --git a/kexgexc.c b/kexgexc.c
index e99e0cf21..097d83f30 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexc.c,v 1.38 2021/12/19 22:08:06 djm Exp $ */
+/* $OpenBSD: kexgexc.c,v 1.39 2025/10/03 00:08:02 djm Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -30,6 +30,8 @@
#include <sys/types.h>
+#include "openbsd-compat/openssl-compat.h"
+#include <openssl/bn.h>
#include <openssl/dh.h>
#include <stdarg.h>
@@ -37,8 +39,6 @@
#include <string.h>
#include <signal.h>
-#include "openbsd-compat/openssl-compat.h"
-
#include "sshkey.h"
#include "cipher.h"
#include "digest.h"
diff --git a/kexgexs.c b/kexgexs.c
index 100be0316..344c3cd81 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.47 2024/05/17 00:30:23 djm Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.48 2025/10/03 00:08:02 djm Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -34,9 +34,9 @@
#include <string.h>
#include <signal.h>
-#include <openssl/dh.h>
-
#include "openbsd-compat/openssl-compat.h"
+#include <openssl/bn.h>
+#include <openssl/dh.h>
#include "sshkey.h"
#include "cipher.h"
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 4539d8d50..d07928b17 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -23,6 +23,7 @@
#include <openssl/opensslv.h>
#include <openssl/crypto.h>
#include <openssl/evp.h>
+#include <openssl/bn.h>
#include <openssl/rsa.h>
#ifdef OPENSSL_HAS_ECC
#include <openssl/ecdsa.h>
diff --git a/ssh-keygen.c b/ssh-keygen.c
index d450f3e41..3c582a83a 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.484 2025/09/25 12:52:21 jsg Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.485 2025/10/03 00:08:02 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -19,9 +19,10 @@
#include <sys/stat.h>
#ifdef WITH_OPENSSL
+#include "openbsd-compat/openssl-compat.h"
+#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
-#include "openbsd-compat/openssl-compat.h"
#endif
#include <stdint.h>
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index 36b428223..0a94fcd97 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.71 2025/09/25 06:23:19 jsg Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.72 2025/10/03 00:08:02 djm Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
* Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@@ -34,6 +34,8 @@
#include "openbsd-compat/openssl-compat.h"
#ifdef WITH_OPENSSL
+#include "openbsd-compat/openssl-compat.h"
+#include <openssl/bn.h>
#include <openssl/ecdsa.h>
#include <openssl/x509.h>
#include <openssl/err.h>
diff --git a/ssh-rsa.c b/ssh-rsa.c
index abc5b17fb..fe1518984 100644
--- a/ssh-rsa.c
+++ b/ssh-rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-rsa.c,v 1.81 2025/07/24 05:44:55 djm Exp $ */
+/* $OpenBSD: ssh-rsa.c,v 1.82 2025/10/03 00:08:02 djm Exp $ */
/*
* Copyright (c) 2000, 2003 Markus Friedl <markus at openbsd.org>
*
@@ -21,6 +21,8 @@
#include <sys/types.h>
+#include "openbsd-compat/openssl-compat.h"
+#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -34,8 +36,6 @@
#include "digest.h"
#include "log.h"
-#include "openbsd-compat/openssl-compat.h"
-
static u_int
ssh_rsa_size(const struct sshkey *k)
{
diff --git a/sshkey.c b/sshkey.c
index fa883b084..e17e929e0 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.154 2025/09/05 10:23:55 dtucker Exp $ */
+/* $OpenBSD: sshkey.c,v 1.155 2025/10/03 00:08:02 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@@ -32,6 +32,7 @@
#include <netinet/in.h>
#ifdef WITH_OPENSSL
+#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/pem.h>
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list