Drop support for OpenSSL 1.0; fix compilation with OpenSSL 3

AGWA · AGWA · commit 4dd5c202434a · 2025-09-23T20:37:48.000-04:00
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ OBJFILES = \
     coprocess.o \
     fhstream.o
 
-OBJFILES += crypto-openssl-10.o crypto-openssl-11.o
+OBJFILES += crypto-openssl-11.o
 LDFLAGS += -lcrypto
 
 XSLTPROC ?= xsltproc
diff --git a/crypto-openssl-10.cpp b/crypto-openssl-10.cpp
diff --git a/crypto-openssl-11.cpp b/crypto-openssl-11.cpp
@@ -30,8 +30,6 @@
 
 #include <openssl/opensslconf.h>
 
-#if defined(OPENSSL_API_COMPAT)
-
 #include "crypto.hpp"
 #include "key.hpp"
 #include "util.hpp"
@@ -115,5 +113,3 @@ void random_bytes (unsigned char* buffer, size_t len)
 		throw Crypto_error("random_bytes", message.str());
 	}
 }
-
-#endif

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@`
`30`	`30`
`31`	`31`	`#include <openssl/opensslconf.h>`
`32`	`32`
`33`		`-#if defined(OPENSSL_API_COMPAT)`
`34`		`-`
`35`	`33`	`#include "crypto.hpp"`
`36`	`34`	`#include "key.hpp"`
`37`	`35`	`#include "util.hpp"`
`@@ -115,5 +113,3 @@ void random_bytes (unsigned char* buffer, size_t len)`
`115`	`113`	`throw Crypto_error("random_bytes", message.str());`
`116`	`114`	`}`
`117`	`115`	`}`
`118`		`-`
`119`		`-#endif`