denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get AIK certificate encoding in PUBKEY_ASN1_DER if it's just public key

Browse Source
This commit is contained in:
Sansar Choinyambuu
2011-11-28 14:39:50 +01:00
committed by Andreas Steffen
parent f557e5fcaf
commit fe247ba2a6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libpts/pts/pts.c
+8 -5
View File
@@ -25,6 +25,10 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#include <errno.h> #include <errno.h>
#include <openssl/asn1t.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
#define PTS_BUF_SIZE 4096 #define PTS_BUF_SIZE 4096
typedef struct private_pts_t private_pts_t; typedef struct private_pts_t private_pts_t;
@@ -358,7 +362,7 @@ static void load_aik(private_pts_t *this)
METHOD(pts_t, get_aik, certificate_t*, METHOD(pts_t, get_aik, certificate_t*,
private_pts_t *this) private_pts_t *this)
{ {
return this->aik; return this->aik;
} }
METHOD(pts_t, set_aik, void, METHOD(pts_t, set_aik, void,
@@ -817,7 +821,7 @@ METHOD(pts_t, quote_tpm, bool,
/* Create from AIK public key a HKEY object to sign Quote operation output*/ /* Create from AIK public key a HKEY object to sign Quote operation output*/
if (this->aik->get_type(this->aik) == CERT_TRUSTED_PUBKEY) if (this->aik->get_type(this->aik) == CERT_TRUSTED_PUBKEY)
{ {
if (!this->aik->get_encoding(this->aik, CERT_ASN1_DER, &aik_key_encoding)) if (!this->aik->get_encoding(this->aik, PUBKEY_ASN1_DER, &aik_key_encoding))
{ {
DBG1(DBG_PTS, "encoding AIK certificate for quote operation failed"); DBG1(DBG_PTS, "encoding AIK certificate for quote operation failed");
goto err1; goto err1;
@@ -826,7 +830,6 @@ METHOD(pts_t, quote_tpm, bool,
else if (this->aik->get_type(this->aik) == CERT_X509) else if (this->aik->get_type(this->aik) == CERT_X509)
{ {
public_key_t *key = this->aik->get_public_key(this->aik); public_key_t *key = this->aik->get_public_key(this->aik);
if (key == NULL) if (key == NULL)
{ {
DBG1(DBG_PTS, "unable to retrieve public key from AIK certificate"); DBG1(DBG_PTS, "unable to retrieve public key from AIK certificate");
@@ -843,9 +846,9 @@ METHOD(pts_t, quote_tpm, bool,
DBG1(DBG_PTS, "AIK is neither X509 certificate nor Public Key"); DBG1(DBG_PTS, "AIK is neither X509 certificate nor Public Key");
goto err1; goto err1;
} }
result = Tspi_Context_LoadKeyByBlob (hContext, hSRK, aik_key_encoding.len, result = Tspi_Context_LoadKeyByBlob (hContext, hSRK, aik_key_encoding.len,
(BYTE*)aik_key_encoding.ptr, &hAIK); aik_key_encoding.ptr, &hAIK);
if (result != TSS_SUCCESS) if (result != TSS_SUCCESS)
{ {
goto err1; goto err1;