Changed the static function name in openssl_rsa_public_key object
Removed unused chunk variable from PTS verify_quote_signature function
This commit is contained in:
committed by
Andreas Steffen
parent
5242a729ca
commit
824ace105a
@@ -161,7 +161,7 @@ METHOD(imc_t, type_supported, bool,
|
|||||||
METHOD(imc_t, destroy, void,
|
METHOD(imc_t, destroy, void,
|
||||||
private_tnc_imc_t *this)
|
private_tnc_imc_t *this)
|
||||||
{
|
{
|
||||||
dlclose(this->handle);
|
//dlclose(this->handle);
|
||||||
this->mutex->destroy(this->mutex);
|
this->mutex->destroy(this->mutex);
|
||||||
free(this->supported_types);
|
free(this->supported_types);
|
||||||
free(this->name);
|
free(this->name);
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ METHOD(imv_t, type_supported, bool,
|
|||||||
METHOD(imv_t, destroy, void,
|
METHOD(imv_t, destroy, void,
|
||||||
private_tnc_imv_t *this)
|
private_tnc_imv_t *this)
|
||||||
{
|
{
|
||||||
dlclose(this->handle);
|
//dlclose(this->handle);
|
||||||
this->mutex->destroy(this->mutex);
|
this->mutex->destroy(this->mutex);
|
||||||
free(this->supported_types);
|
free(this->supported_types);
|
||||||
free(this->name);
|
free(this->name);
|
||||||
|
|||||||
@@ -1200,7 +1200,6 @@ METHOD(pts_t, verify_quote_signature, bool,
|
|||||||
private_pts_t *this, chunk_t data, chunk_t signature)
|
private_pts_t *this, chunk_t data, chunk_t signature)
|
||||||
{
|
{
|
||||||
public_key_t *aik_pub_key;
|
public_key_t *aik_pub_key;
|
||||||
chunk_t key_encoding;
|
|
||||||
|
|
||||||
aik_pub_key = this->aik->get_public_key(this->aik);
|
aik_pub_key = this->aik->get_public_key(this->aik);
|
||||||
if (!aik_pub_key)
|
if (!aik_pub_key)
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ error:
|
|||||||
/**
|
/**
|
||||||
* Verification of an EMPSA PKCS1 signature described in PKCS#1
|
* Verification of an EMPSA PKCS1 signature described in PKCS#1
|
||||||
*/
|
*/
|
||||||
static bool verify_rsa_signature(private_openssl_rsa_public_key_t *this,
|
static bool verify_signature(private_openssl_rsa_public_key_t *this,
|
||||||
int type, chunk_t data, chunk_t signature)
|
int type, chunk_t data, chunk_t signature)
|
||||||
{
|
{
|
||||||
bool valid = FALSE;
|
bool valid = FALSE;
|
||||||
@@ -187,7 +187,7 @@ METHOD(public_key_t, verify, bool,
|
|||||||
switch (scheme)
|
switch (scheme)
|
||||||
{
|
{
|
||||||
case SIGN_RSA_SHA1:
|
case SIGN_RSA_SHA1:
|
||||||
return verify_rsa_signature(this, NID_sha1, data, signature);
|
return verify_signature(this, NID_sha1, data, signature);
|
||||||
case SIGN_RSA_EMSA_PKCS1_NULL:
|
case SIGN_RSA_EMSA_PKCS1_NULL:
|
||||||
return verify_emsa_pkcs1_signature(this, NID_undef, data, signature);
|
return verify_emsa_pkcs1_signature(this, NID_undef, data, signature);
|
||||||
case SIGN_RSA_EMSA_PKCS1_SHA1:
|
case SIGN_RSA_EMSA_PKCS1_SHA1:
|
||||||
|
|||||||
Reference in New Issue
Block a user