Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-08-18 22:57:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm12: LibreSSL seems to not have the new OpenSSL 1.1 API

Browse Source 
LibreSSL on OpenBSD seems to not support the new API of OpenSSL 1.1.
So create a new #define OPENSSL_OLD_API that is set if the old API
is to be used.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger 2017-10-11 14:45:41 -04:00 committed by Stefan Berger
parent 9649f4b866
commit c525dad4e4
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tpm12/tpm_crypto.c
View File

@ -132,6 +132,14 @@ static TPM_RESULT TPM_SymmetricKeyData_Crypt(unsigned char *data_out,
#include <openssl/aes.h>
#if defined(__OpenBSD__)
# define OPENSSL_OLD_API
#else
#if OPENSSL_VERSION_NUMBER < 0x10100000
#define OPENSSL_OLD_API
#endif
#endif
/* AES requires data lengths that are a multiple of the block size */
#define TPM_AES_BITS 128
/* The AES block size is always 16 bytes */
@ -380,7 +388,7 @@ TPM_RESULT TPM_RSAGenerateKeyPair(unsigned char **n, /* public key -
}
}
if (rc == 0) {
#if OPENSSL_VERSION_NUMBER < 0x10100000
#if defined OPENSSL_OLD_API
bnn = rsa->n;
bnp = rsa->p;
bnq = rsa->q;
@ -469,7 +477,7 @@ static TPM_RESULT TPM_RSAGeneratePublicToken(RSA **rsa_pub_key, /* freed by cal
rc = TPM_bin2bn((TPM_BIGNUM *)&e, earr, ebytes); /* freed by caller */
}
if (rc == 0) {
#if OPENSSL_VERSION_NUMBER < 0x10100000
#if defined OPENSSL_OLD_API
(*rsa_pub_key)->n = n;
(*rsa_pub_key)->e = e;
(*rsa_pub_key)->d = NULL;
@ -527,7 +535,7 @@ static TPM_RESULT TPM_RSAGeneratePrivateToken(RSA **rsa_pri_key, /* freed by cal
rc = TPM_bin2bn((TPM_BIGNUM *)&d, darr, dbytes); /* freed by caller */
}
if (rc == 0) {
#if OPENSSL_VERSION_NUMBER < 0x10100000
#if defined OPENSSL_OLD_API
(*rsa_pri_key)->n = n;
(*rsa_pri_key)->e = e;
(*rsa_pri_key)->d = d;