9f76fe1445
Five commits from upstream were applied to v. 7.8-p1:
482d23bc upstream: hold our collective noses and use the openssl-1.1.x
API in
48f54b9d adapt -portable to OpenSSL 1.1x API
86e0a9f3 upstream: use only openssl-1.1.x API here too
a3fd8074 upstream: missed a bit of openssl-1.0.x API in this unittest
d64e7852 add compat header
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
25 lines
638 B
Diff
25 lines
638 B
Diff
From a3fc79d9cdab61ed58dafc4c49b295ec1bbe1d84 Mon Sep 17 00:00:00 2001
|
|
From: Damien Miller <djm@mindrot.org>
|
|
Date: Thu, 13 Sep 2018 19:05:48 +1000
|
|
Subject: [PATCH 5/5] add compat header
|
|
|
|
---
|
|
regress/unittests/sshkey/common.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/regress/unittests/sshkey/common.c b/regress/unittests/sshkey/common.c
|
|
index 548da684..e63465c4 100644
|
|
--- a/regress/unittests/sshkey/common.c
|
|
+++ b/regress/unittests/sshkey/common.c
|
|
@@ -27,6 +27,8 @@
|
|
# include <openssl/ec.h>
|
|
#endif
|
|
|
|
+#include "openbsd-compat/openssl-compat.h"
|
|
+
|
|
#include "../test_helper/test_helper.h"
|
|
|
|
#include "ssherr.h"
|
|
--
|
|
2.16.4
|
|
|