CIE-Middleware-RPM-Package/cie-middleware-fix-openssl.patch at main · Leuca/CIE-Middleware-RPM-Package · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
From 2ccecac87eb5caa31680cfc5e08fbfdd3ca80bf5 Mon Sep 17 00:00:00 2001
From: Luca Magrone <luca@magrone.cc>
Date: Mon, 7 Oct 2024 13:29:29 +0200
Subject: [PATCH] CIEEngine: fix openssl compilation issues

Fix some variables that sould be constants.
Add and use do_sign instead of wrongly reuse orig_sign.
Thanks to https://github.com/M0Rf30/cie-middleware-linux/commit/be6a3009b5b511ff78648b4e4c4e5b23ad602e15

Signed-off-by: Luca Magrone <luca@magrone.cc>
---
 cie_sign_sdk/src/CIEEngine.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/cie_sign_sdk/src/CIEEngine.c b/cie_sign_sdk/src/CIEEngine.c
index 39048e1..2c454d1 100644
--- a/cie_sign_sdk/src/CIEEngine.c
+++ b/cie_sign_sdk/src/CIEEngine.c
@@ -15,7 +15,7 @@
 #include <openssl/ecdsa.h>
 #include <openssl/ecdh.h>

-unsigned char* cie_certificate;
+const unsigned char* cie_certificate;
 unsigned long cie_certlen;
 unsigned char* cie_pin;
 unsigned long cie_pinlen;
@@ -57,7 +57,7 @@ static const ENGINE_CMD_DEFN cie_engine_cmd_defns[] = {


 // Make Digest Info
-    int makeDigestInfo(int algid, unsigned char* pbtDigest, size_t btDigestLen, unsigned char* pbtDigestInfo, size_t* pbtDigestInfoLen)
+    int makeDigestInfo(int algid, const unsigned char* pbtDigest, size_t btDigestLen, unsigned char* pbtDigestInfo, size_t* pbtDigestInfoLen)
 {
     size_t requestedLen;
     switch(algid)
@@ -221,7 +221,7 @@ static int cie_pkey_rsa_sign(EVP_PKEY_CTX *evp_pkey_ctx,
     printf("call cie_pkey_rsa_sign\n");

     EVP_PKEY *pkey;
-    RSA *rsa;
+    const RSA *rsa;
     const EVP_MD *sig_md;

     printf("%s:%d cie_pkey_rsa_sign() "
@@ -338,6 +338,8 @@ EC_KEY_METHOD *cie_get_ec_key_method(void)
     static EC_KEY_METHOD *ops = NULL;
     int (*orig_sign)(int, const unsigned char *, int, unsigned char *,
         unsigned int *, const BIGNUM *, const BIGNUM *, EC_KEY *) = NULL;
+    ECDSA_SIG *(*do_sign)(const unsigned char *, int, const BIGNUM *,
+                          const BIGNUM *, EC_KEY *) = NULL;

     compute_key_fn ossl_ecdh_compute_key;

@@ -345,7 +347,7 @@ EC_KEY_METHOD *cie_get_ec_key_method(void)
     if (!ops) {
         ops = EC_KEY_METHOD_new((EC_KEY_METHOD *)EC_KEY_OpenSSL());
         EC_KEY_METHOD_get_sign(ops, &orig_sign, NULL, NULL);
-        EC_KEY_METHOD_set_sign(ops, orig_sign, NULL, &orig_sign);
+        EC_KEY_METHOD_set_sign(ops, orig_sign, NULL, do_sign);
         EC_KEY_METHOD_get_compute_key(ops, &ossl_ecdh_compute_key);
         EC_KEY_METHOD_set_compute_key(ops, cie_ecdh_compute_key);

@@ -469,7 +471,7 @@ static EVP_PKEY *cie_load_pubkey(ENGINE *engine, const char *s_key_id,

     printf("call cie_load_pubkey\n");

-    return 1;
+    return NULL;
 }


--
2.43.5