nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-04-05 09:08:04 -05:00
Code Issues Projects Releases Wiki Activity

corrected OpenSSL version checks

Browse Source
This commit is contained in:
Michał Trojnara 2018-11-22 08:33:44 +01:00
parent 9554bbeb14
commit 687bd91531
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -93,17 +93,17 @@ AS_IF([test "x$have_gsf" = "xyes"],
PKG_CHECK_MODULES( PKG_CHECK_MODULES(
[OPENSSL], [OPENSSL],
[libcrypto >= 0.9.8], [libcrypto >= 1.1.0],
, ,
[PKG_CHECK_MODULES( [PKG_CHECK_MODULES(
[OPENSSL], [OPENSSL],
[openssl >= 0.9.8], [openssl >= 1.1.0],
, ,
[AC_CHECK_LIB( [AC_CHECK_LIB(
[crypto], [crypto],
[RSA_verify], [RSA_verify],
[OPENSSL_LIBS="-lcrypto ${SOCKETS_LIBS} ${DL_LIBS}"], [OPENSSL_LIBS="-lcrypto ${SOCKETS_LIBS} ${DL_LIBS}"],
[AC_MSG_ERROR([OpenSSL 0.9.8 or later is required. http://www.openssl.org/])], [AC_MSG_ERROR([OpenSSL 1.1.0 or later is required. http://www.openssl.org/])],
[${DL_LIBS}] [${DL_LIBS}]
)] )]
)] )]

4
osslsigncode.c
View File

@ -2666,7 +2666,6 @@ int main(int argc, char **argv)
DO_EXIT_1("Failed to parse PKCS#12 file: %s (Wrong password?)\n", pkcs12file); DO_EXIT_1("Failed to parse PKCS#12 file: %s (Wrong password?)\n", pkcs12file);
PKCS12_free(p12); PKCS12_free(p12);
} else if (pvkfile != NULL) { } else if (pvkfile != NULL) {
#if OPENSSL_VERSION_NUMBER > 0x10000000
if ((btmp = BIO_new_file(certfile, "rb")) == NULL || if ((btmp = BIO_new_file(certfile, "rb")) == NULL ||
((p7 = d2i_PKCS7_bio(btmp, NULL)) == NULL && ((p7 = d2i_PKCS7_bio(btmp, NULL)) == NULL &&
(certs = PEM_read_certs(btmp, "")) == NULL)) (certs = PEM_read_certs(btmp, "")) == NULL))
@ -2678,9 +2677,6 @@ int main(int argc, char **argv)
(pkey = b2i_PVK_bio(btmp, NULL, NULL)) == NULL)) (pkey = b2i_PVK_bio(btmp, NULL, NULL)) == NULL))
DO_EXIT_1("Failed to read PVK file: %s\n", pvkfile); DO_EXIT_1("Failed to read PVK file: %s\n", pvkfile);
BIO_free(btmp); BIO_free(btmp);
#else
DO_EXIT_1("Can not read keys from PVK files, must compile against a newer version of OpenSSL: %s\n", pvkfile);
#endif
} else if (p11engine != NULL && p11module != NULL) { } else if (p11engine != NULL && p11module != NULL) {
const int CMD_MANDATORY = 0; const int CMD_MANDATORY = 0;
ENGINE_load_dynamic(); ENGINE_load_dynamic();