diff options
| author | Sansar Choinyambuu <schoinya@hsr.ch> | 2011-11-02 08:05:28 +0100 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2011-11-28 21:17:16 +0100 |
| commit | 824ace105a89fc9c9f8c727a49f2ff48f1fa4bfb (patch) | |
| tree | 8be0c0b2a2003a254fac3de95d6ba81005869a60 | |
| parent | 5242a729ca7bba0aa90b37126d8067419bf2d6b0 (diff) | |
| download | strongswan-824ace105a89fc9c9f8c727a49f2ff48f1fa4bfb.tar.bz2 strongswan-824ace105a89fc9c9f8c727a49f2ff48f1fa4bfb.tar.xz | |
Changed the static function name in openssl_rsa_public_key object
Removed unused chunk variable from PTS verify_quote_signature function
| -rw-r--r-- | src/libcharon/plugins/tnc_imc/tnc_imc.c | 2 | ||||
| -rw-r--r-- | src/libcharon/plugins/tnc_imv/tnc_imv.c | 2 | ||||
| -rw-r--r-- | src/libpts/pts/pts.c | 9 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc.c b/src/libcharon/plugins/tnc_imc/tnc_imc.c index 52e526604..cf2f09a3c 100644 --- a/src/libcharon/plugins/tnc_imc/tnc_imc.c +++ b/src/libcharon/plugins/tnc_imc/tnc_imc.c @@ -161,7 +161,7 @@ METHOD(imc_t, type_supported, bool, METHOD(imc_t, destroy, void, private_tnc_imc_t *this) { - dlclose(this->handle); + //dlclose(this->handle); this->mutex->destroy(this->mutex); free(this->supported_types); free(this->name); diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv.c b/src/libcharon/plugins/tnc_imv/tnc_imv.c index f9cfc3417..ea15179db 100644 --- a/src/libcharon/plugins/tnc_imv/tnc_imv.c +++ b/src/libcharon/plugins/tnc_imv/tnc_imv.c @@ -162,7 +162,7 @@ METHOD(imv_t, type_supported, bool, METHOD(imv_t, destroy, void, private_tnc_imv_t *this) { - dlclose(this->handle); + //dlclose(this->handle); this->mutex->destroy(this->mutex); free(this->supported_types); free(this->name); diff --git a/src/libpts/pts/pts.c b/src/libpts/pts/pts.c index 9c1703de1..5a5f05b24 100644 --- a/src/libpts/pts/pts.c +++ b/src/libpts/pts/pts.c @@ -1026,7 +1026,7 @@ METHOD(pts_t, does_pcr_value_match, bool, } } DESTROY_IF(e); - + this->pcrs->insert_last(this->pcrs, new); qsort(this->pcrs, this->pcrs->get_count(this->pcrs), @@ -1168,16 +1168,16 @@ METHOD(pts_t, get_quote_info, bool, *out_pcr_composite = chunk_clone(pcr_composite); DBG4(DBG_PTS, "calculated PCR Composite: %B", out_pcr_composite); } - + /* SHA1 hash of PCR Composite to construct TPM_QUOTE_INFO */ hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA1); hasher->allocate_hash(hasher, pcr_composite, &hash_pcr_composite); hasher->destroy(hasher); - + writer->write_data(writer, hash_pcr_composite); chunk_clear(&pcr_composite); chunk_clear(&hash_pcr_composite); - + if (!this->secret.ptr) { DBG1(DBG_PTS, "Secret assessment value unavailable", @@ -1200,7 +1200,6 @@ METHOD(pts_t, verify_quote_signature, bool, private_pts_t *this, chunk_t data, chunk_t signature) { public_key_t *aik_pub_key; - chunk_t key_encoding; aik_pub_key = this->aik->get_public_key(this->aik); if (!aik_pub_key) diff --git a/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c b/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c index 2c9ad2a55..00f131423 100644 --- a/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c +++ b/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c @@ -119,7 +119,7 @@ error: /** * 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) { bool valid = FALSE; @@ -187,7 +187,7 @@ METHOD(public_key_t, verify, bool, switch (scheme) { 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: return verify_emsa_pkcs1_signature(this, NID_undef, data, signature); case SIGN_RSA_EMSA_PKCS1_SHA1: |