Fix build with OpenSSL < 3.0 (#5)

oleg-jukovec · web-flow · commit f7d4135a4f7c · 2022-04-19T17:40:58.000+03:00
- replace OPENSSL_VERSION_MAJOR by OPENSSL_VERSIO_NUMBER
diff --git a/fips.go b/fips.go
@@ -17,7 +17,7 @@ package openssl
 /*
 #include <openssl/ssl.h>
 
-#if OPENSSL_VERSION_MAJOR == 3
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
 	int FIPS_mode_set(int ONOFF) {
 		return 0;
 	}
@@ -35,7 +35,7 @@ func FIPSModeSet(mode bool) error {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	if C.OPENSSL_VERSION_MAJOR == 3 {
+	if C.OPENSSL_VERSION_NUMBER >= 0x30000000 {
 		return errors.New("FIPS_mode_set() has been deleted from OpenSSL 3.0")
 	}
 
diff --git a/hostname.go b/hostname.go
@@ -17,7 +17,7 @@ package openssl
 /*
 #include <openssl/ssl.h>
 #include <openssl/conf.h>
-#if OPENSSL_VERSION_MAJOR == 3
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
 	#include <openssl/x509v3.h>
 	typedef const char x509char;
 #else

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ package openssl`
`17`	`17`	`/*`
`18`	`18`	`#include <openssl/ssl.h>`
`19`	`19`
`20`		`-#if OPENSSL_VERSION_MAJOR == 3`
	`20`	`+#if OPENSSL_VERSION_NUMBER >= 0x30000000L`
`21`	`21`	`int FIPS_mode_set(int ONOFF) {`
`22`	`22`	`return 0;`
`23`	`23`	`}`
`@@ -35,7 +35,7 @@ func FIPSModeSet(mode bool) error {`
`35`	`35`	`runtime.LockOSThread()`
`36`	`36`	`defer runtime.UnlockOSThread()`
`37`	`37`
`38`		`- if C.OPENSSL_VERSION_MAJOR == 3 {`
	`38`	`+ if C.OPENSSL_VERSION_NUMBER >= 0x30000000 {`
`39`	`39`	`return errors.New("FIPS_mode_set() has been deleted from OpenSSL 3.0")`
`40`	`40`	`}`
`41`	`41`