From 1adcceaa663087de67d5dd3ae40c88b987e26631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Hohnst=C3=A4dt?= <christian@hohnstaedt.de>
Date: Sun, 16 May 2021 12:15:05 +0200
Subject: [PATCH] Drop OpenSSL backward comatibility for NID_tlsfeature

it was not defined for OpenSSL < 1.1.0
which is not supported anymore anyway.
---
 lib/database_model.cpp  | 1 -
 lib/oid.cpp             | 4 ----
 lib/oid.h               | 3 ---
 widgets/NewX509_ext.cpp | 4 ----
 4 files changed, 12 deletions(-)

diff --git a/lib/database_model.cpp b/lib/database_model.cpp
index 6841ab57..9579d61a 100644
--- a/lib/database_model.cpp
+++ b/lib/database_model.cpp
@@ -8,7 +8,6 @@
 #include <QDir>
 #include <QDebug>
 #include "widgets/XcaWarning.h"
-#include "widgets/OpenDb.h"
 #include "widgets/PwDialog.h"
 
 #include "exception.h"
diff --git a/lib/oid.cpp b/lib/oid.cpp
index 2e79a94d..fd856dad 100644
--- a/lib/oid.cpp
+++ b/lib/oid.cpp
@@ -18,10 +18,6 @@
 #include "widgets/XcaWarning.h"
 #include "widgets/MainWindow.h"
 
-#ifndef NID_tlsfeature
-int NID_tlsfeature = NID_undef;
-#endif
-
 int first_additional_oid = 0;
 
 NIDlist extkeyuse_nid;
diff --git a/lib/oid.h b/lib/oid.h
index 8e982c9c..5160cea9 100644
--- a/lib/oid.h
+++ b/lib/oid.h
@@ -14,9 +14,6 @@ class QString;
 
 typedef QList<int> NIDlist;
 
-#ifndef NID_tlsfeature
-extern int NID_tlsfeature;
-#endif
 extern NIDlist extkeyuse_nid;
 extern NIDlist distname_nid;
 
diff --git a/widgets/NewX509_ext.cpp b/widgets/NewX509_ext.cpp
index 9e8af86c..7d5e79db 100644
--- a/widgets/NewX509_ext.cpp
+++ b/widgets/NewX509_ext.cpp
@@ -53,11 +53,7 @@ x509v3ext NewX509::getOCSPstaple()
 	x509v3ext ext;
 	if (OCSPstaple->isChecked())
 		ext.create(NID_tlsfeature,
-#ifdef NID_tlsfeature
 			"status_request",
-#else
-			"DER:30:03:02:01:05",
-#endif
 			&ext_ctx);
 	return ext;
 }