From 2cb6f9c94fea8c397ae77bb9fc6ef866be6890e2 Mon Sep 17 00:00:00 2001
From: Frank Morgner <frankmorgner@gmail.com>
Date: Tue, 6 Nov 2018 09:44:43 +0100
Subject: [PATCH] fixed compilation without OpenSSL

closes https://github.com/OpenSC/OpenSC/pull/1518
---
 src/libopensc/sm.h            | 6 ------
 src/pkcs11/framework-pkcs15.c | 5 +++--
 src/sm/sm-eac.c               | 2 ++
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/libopensc/sm.h b/src/libopensc/sm.h
index b3b1ae48..d2d00e37 100644
--- a/src/libopensc/sm.h
+++ b/src/libopensc/sm.h
@@ -35,12 +35,6 @@ extern "C" {
 #include <libopensc/types.h>
 #include <common/libscdl.h>
 
-#ifndef SHA_DIGEST_LENGTH
-#define SHA_DIGEST_LENGTH	20
-#define SHA1_DIGEST_LENGTH	20
-#define SHA256_DIGEST_LENGTH	32
-#endif
-
 #define SM_TYPE_GP_SCP01	0x100
 #define SM_TYPE_CWA14890	0x400
 #define SM_TYPE_DH_RSA		0x500
diff --git a/src/pkcs11/framework-pkcs15.c b/src/pkcs11/framework-pkcs15.c
index 4eadf66f..c4605810 100644
--- a/src/pkcs11/framework-pkcs15.c
+++ b/src/pkcs11/framework-pkcs15.c
@@ -27,9 +27,10 @@
 #include "libopensc/cardctl.h"
 #include "ui/notify.h"
 #include "common/compat_strnlen.h"
-
 #ifdef ENABLE_OPENSSL
-#include <openssl/opensslv.h>
+#include <openssl/sha.h>
+#else
+#define SHA_DIGEST_LENGTH	20
 #endif
 
 #include "sc-pkcs11.h"
diff --git a/src/sm/sm-eac.c b/src/sm/sm-eac.c
index 8317f41b..9ac9807c 100644
--- a/src/sm/sm-eac.c
+++ b/src/sm/sm-eac.c
@@ -32,6 +32,8 @@
 
 #ifdef ENABLE_OPENSSL
 #include <openssl/evp.h>
+#else
+#define ssl_error(a)
 #endif
 
 char eac_default_flags = 0;