blob: 555ded5bd4c7b81a18e1978097a9a6e15a620a02 [file] [log] [blame]
Serge Bazanski72c1f2b2024-06-04 13:42:48 +00001From 42c0bd4522b06361bdbbb1fec182bdc363db9982 Mon Sep 17 00:00:00 2001
2From: Serge Bazanski <serge@monogon.tech>
3Date: Tue, 4 Jun 2024 12:58:37 +0200
4Subject: [PATCH 2/6] boringssl compat: removed const_DES_cblock
5
6This was some kind of hack for GCC 2.8.1 that never made it into
7BoringSSL.
8---
9 src/tpm2/crypto/openssl/TpmToOsslDesSupport.c | 10 +++++-----
10 1 file changed, 5 insertions(+), 5 deletions(-)
11
12diff --git a/src/tpm2/crypto/openssl/TpmToOsslDesSupport.c b/src/tpm2/crypto/openssl/TpmToOsslDesSupport.c
13index d27aad2..9f972d6 100644
14--- a/src/tpm2/crypto/openssl/TpmToOsslDesSupport.c
15+++ b/src/tpm2/crypto/openssl/TpmToOsslDesSupport.c
16@@ -78,14 +78,14 @@ TDES_set_encrypt_key(
17 tpmKeyScheduleTDES *keySchedule
18 )
19 {
20- DES_set_key_unchecked((const_DES_cblock *)key, &keySchedule[0]);
21- DES_set_key_unchecked((const_DES_cblock *)&key[8], &keySchedule[1]);
22+ DES_set_key_unchecked((const DES_cblock *)key, &keySchedule[0]);
23+ DES_set_key_unchecked((const DES_cblock *)&key[8], &keySchedule[1]);
24 // If is two-key, copy the schedule for K1 into K3, otherwise, compute the
25 // the schedule for K3
26 if(keySizeInBits == 128)
27 keySchedule[2] = keySchedule[0];
28 else
29- DES_set_key_unchecked((const_DES_cblock *)&key[16],
30+ DES_set_key_unchecked((const DES_cblock *)&key[16],
31 &keySchedule[2]);
32 }
33 /* B.2.3.1.3.2. TDES_encyrpt() */
34@@ -97,7 +97,7 @@ void TDES_encrypt(
35 tpmKeyScheduleTDES *ks
36 )
37 {
38- DES_ecb3_encrypt((const_DES_cblock *)in, (DES_cblock *)out,
39+ DES_ecb3_encrypt((const DES_cblock *)in, (DES_cblock *)out,
40 &ks[0], &ks[1], &ks[2],
41 DES_ENCRYPT);
42 }
43@@ -111,7 +111,7 @@ void TDES_decrypt(
44 tpmKeyScheduleTDES *ks
45 )
46 {
47- DES_ecb3_encrypt((const_DES_cblock *)in, (DES_cblock *)out,
48+ DES_ecb3_encrypt((const DES_cblock *)in, (DES_cblock *)out,
49 &ks[0], &ks[1], &ks[2],
50 DES_DECRYPT);
51 }
52--
532.42.0
54