configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([sbsigntool], [0.9.5], [James.Bottomley@HansenPartnership.com])
+AC_INIT([sbsigntool], [0.9.4], [James.Bottomley@HansenPartnership.com])
 
 AM_INIT_AUTOMAKE()
 
@@ -55,12 +55,9 @@ AC_DEFINE_UNQUOTED(HAVE_LITTLE_ENDIAN, $little_endian, [Little-endian system])
 AC_DEFINE_UNQUOTED(HAVE_BIG_ENDIAN, $big_endian, [Big-endian system])
 
 PKG_PROG_PKG_CONFIG()
-PKG_CHECK_MODULES(libcrypto, [libcrypto >= 3.0.0],
-                  [ac_have_openssl3=1],
-                  [PKG_CHECK_MODULES(libcrypto, libcrypto,
-                   [],
-                   AC_MSG_ERROR([libcrypto (from the OpenSSL package) is required]))])
-AM_CONDITIONAL(HAVE_OPENSSL3, test "$ac_have_openssl3" = "1")
+PKG_CHECK_MODULES(libcrypto, libcrypto,
+    [],
+    AC_MSG_ERROR([libcrypto (from the OpenSSL package) is required]))
 
 PKG_CHECK_MODULES(uuid, uuid,
     [],

src/Makefile.am

@@ -4,10 +4,6 @@ bin_PROGRAMS = sbsign sbverify sbattach sbvarsign sbsiglist sbkeysync
 coff_headers = coff/external.h coff/pe.h
 AM_CFLAGS = -Wall -Wextra --std=gnu99
 
-if HAVE_OPENSSL3
-AM_CFLAGS += -DOPENSSL_API_COMPAT=0x10100000L
-endif
-
 common_SOURCES = idc.c idc.h image.c image.h fileio.c fileio.h \
 	efivars.h $(coff_headers)
 common_LDADD = ../lib/ccan/libccan.a $(libcrypto_LIBS)

src/idc.c

@@ -189,7 +189,7 @@ int IDC_set(PKCS7 *p7, PKCS7_SIGNER_INFO *si, struct image *image)
 
 	idc->data->type = OBJ_nid2obj(peid_nid);
 	idc->data->value = ASN1_TYPE_new();
-	type_set_sequence(image, idc->data->value, peid, ASN1_ITEM_rptr(IDC_PEID));
+	type_set_sequence(image, idc->data->value, peid, &IDC_PEID_it);
 
         idc->digest->alg->parameter = ASN1_TYPE_new();
         idc->digest->alg->algorithm = OBJ_nid2obj(NID_sha256);