Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-08-12 21:01:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make libtpms compileable with OpenSSL

Browse Source 
Implement missing base64 decoder support when using OpenSSL library.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Acked-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger 2014-01-07 21:32:05 -05:00 committed by Corey Bryant
parent b888045f4f
commit 30a95c3c82
3 changed files with 72 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.h.in
View File

@ -64,6 +64,12 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* use freebl crypto library */
#undef USE_FREEBL_CRYPTO_LIBRARY
/* use openssl crypto library */
#undef USE_OPENSSL_CRYPTO_LIBRARY
/* Version number of package */
#undef VERSION

6
configure.in
View File

@ -74,10 +74,16 @@ case "$cryptolib" in
freebl)
AM_CONDITIONAL(LIBTPMS_USE_FREEBL, true)
AM_CONDITIONAL(LIBTPMS_USE_OPENSSL, false)
AC_DEFINE([USE_FREEBL_CRYPTO_LIBRARY],
[1],
[use freebl crypto library])
;;
openssl)
AM_CONDITIONAL(LIBTPMS_USE_FREEBL, false)
AM_CONDITIONAL(LIBTPMS_USE_OPENSSL, true)
AC_DEFINE([USE_OPENSSL_CRYPTO_LIBRARY],
[1],
[use openssl crypto library])
;;
esac

63
src/tpm_library.c
View File

@ -37,13 +37,22 @@
/* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
/********************************************************************************/
#include <config.h>
#include <assert.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <plbase64.h>
#ifdef USE_FREEBL_CRYPTO_LIBRARY
# include <plbase64.h>
#endif
#ifdef USE_OPENSSL_CRYPTO_LIBRARY
# include <openssl/bio.h>
# include <openssl/evp.h>
#endif
#include "tpm_debug.h"
#include "tpm_error.h"
@ -256,6 +265,46 @@ static int is_base64ltr(char c)
c == '=');
}
#ifdef USE_OPENSSL_CRYPTO_LIBRARY
static unsigned char *TPMLIB_OpenSSL_Base64Decode(char *input,
unsigned int outputlen)
{
BIO *b64, *bmem;
unsigned char *res = NULL;
int n;
TPM_RESULT rc;
b64 = BIO_new(BIO_f_base64());
if (!b64) {
return NULL;
}
bmem = BIO_new_mem_buf(input, strlen(input));
if (!bmem) {
BIO_free(b64);
goto cleanup;
}
bmem = BIO_push(b64, bmem);
BIO_set_flags(bmem, BIO_FLAGS_BASE64_NO_NL);
rc = TPM_Malloc(&res, outputlen);
if (rc != TPM_SUCCESS) {
goto cleanup;
}
n = BIO_read(bmem, res, outputlen);
if (n <= 0) {
TPM_Free(res);
res = NULL;
goto cleanup;
}
cleanup:
BIO_free_all(bmem);
return res;
}
#endif
/*
* Base64 decode the string starting at 'start' and the last
@ -289,10 +338,12 @@ static unsigned char *TPMLIB_Base64Decode(const char *start, const char *end,
while (s < end) {
c = *s;
if (c != '=' && is_base64ltr(c)) {
if (is_base64ltr(c)) {
*d = c;
d++;
numbase64chars++;
if (c != '=') {
numbase64chars++;
}
} else if (c == 0) {
break;
}
@ -314,7 +365,13 @@ static unsigned char *TPMLIB_Base64Decode(const char *start, const char *end,
break;
}
#ifdef USE_FREEBL_CRYPTO_LIBRARY
ret = (unsigned char *)PL_Base64Decode(input, 0, NULL);
#endif
#ifdef USE_OPENSSL_CRYPTO_LIBRARY
ret = TPMLIB_OpenSSL_Base64Decode(input, *length);
#endif
err_exit:
free(input);