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

certificate_t->issued_by takes an argument to receive signature scheme

Browse Source
This commit is contained in:
Martin Willi
2012-06-12 14:24:49 +02:00
parent 439d0742e9
commit a37f2d2006
16 changed files with 68 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_crl.c
+6 -1
View File
@@ -225,7 +225,8 @@ METHOD(certificate_t, has_subject_or_issuer, id_match_t,
}
METHOD(certificate_t, issued_by, bool,
private_openssl_crl_t *this, certificate_t *issuer)
private_openssl_crl_t *this, certificate_t *issuer,
signature_scheme_t *scheme)
{
chunk_t fingerprint, tbs;
public_key_t *key;
@@ -270,6 +271,10 @@ METHOD(certificate_t, issued_by, bool,
openssl_asn1_str2chunk(this->crl->signature));
free(tbs.ptr);
key->destroy(key);
if (valid && scheme)
{
*scheme = this->scheme;
}
return valid;
}
src/libstrongswan/plugins/openssl/openssl_x509.c
+7 -2
View File
@@ -350,7 +350,8 @@ METHOD(certificate_t, has_issuer, id_match_t,
}
METHOD(certificate_t, issued_by, bool,
private_openssl_x509_t *this, certificate_t *issuer)
private_openssl_x509_t *this, certificate_t *issuer,
signature_scheme_t *scheme)
{
public_key_t *key;
bool valid;
@@ -393,6 +394,10 @@ METHOD(certificate_t, issued_by, bool,
openssl_asn1_str2chunk(this->x509->signature));
free(tbs.ptr);
key->destroy(key);
if (valid && scheme)
{
*scheme = this->scheme;
}
return valid;
}
@@ -975,7 +980,7 @@ static bool parse_certificate(private_openssl_x509_t *this)
hasher->allocate_hash(hasher, this->encoding, &this->hash);
hasher->destroy(hasher);
if (issued_by(this, &this->public.x509.interface))
if (issued_by(this, &this->public.x509.interface, NULL))
{
this->flags |= X509_SELF_SIGNED;
}
src/libstrongswan/plugins/pgp/pgp_cert.c
+1 -1
View File
@@ -114,7 +114,7 @@ METHOD(certificate_t, has_issuer, id_match_t,
}
METHOD(certificate_t, issued_by,bool,
private_pgp_cert_t *this, certificate_t *issuer)
private_pgp_cert_t *this, certificate_t *issuer, signature_scheme_t *scheme)
{
/* TODO: check signature blobs for a valid signature */
return FALSE;
src/libstrongswan/plugins/pubkey/pubkey_cert.c
+6 -1
View File
@@ -126,8 +126,13 @@ METHOD(certificate_t, equals, bool,
}
METHOD(certificate_t, issued_by, bool,
private_pubkey_cert_t *this, certificate_t *issuer)
private_pubkey_cert_t *this, certificate_t *issuer,
signature_scheme_t *scheme)
{
if (scheme)
{
*scheme = SIGN_UNKNOWN;
}
return equals(this, issuer);
}
src/libstrongswan/plugins/x509/x509_ac.c
+5 -1
View File
@@ -701,7 +701,7 @@ METHOD(certificate_t, has_issuer, id_match_t,
}
METHOD(certificate_t, issued_by, bool,
private_x509_ac_t *this, certificate_t *issuer)
private_x509_ac_t *this, certificate_t *issuer, signature_scheme_t *schemep)
{
public_key_t *key;
signature_scheme_t scheme;
@@ -750,6 +750,10 @@ METHOD(certificate_t, issued_by, bool,
}
valid = key->verify(key, scheme, this->certificateInfo, this->signature);
key->destroy(key);
if (valid && schemep)
{
*schemep = scheme;
}
return valid;
}
src/libstrongswan/plugins/x509/x509_cert.c
+8 -2
View File
@@ -1483,7 +1483,8 @@ end:
/* check if the certificate is self-signed */
if (this->public.interface.interface.issued_by(
&this->public.interface.interface,
&this->public.interface.interface))
&this->public.interface.interface,
NULL))
{
this->flags |= X509_SELF_SIGNED;
}
@@ -1568,7 +1569,8 @@ METHOD(certificate_t, has_issuer, id_match_t,
}
METHOD(certificate_t, issued_by, bool,
private_x509_cert_t *this, certificate_t *issuer)
private_x509_cert_t *this, certificate_t *issuer,
signature_scheme_t *schemep)
{
public_key_t *key;
signature_scheme_t scheme;
@@ -1612,6 +1614,10 @@ METHOD(certificate_t, issued_by, bool,
}
valid = key->verify(key, scheme, this->tbsCertificate, this->signature);
key->destroy(key);
if (valid && schemep)
{
*schemep = scheme;
}
return valid;
}
src/libstrongswan/plugins/x509/x509_crl.c
+5 -1
View File
@@ -442,7 +442,7 @@ METHOD(certificate_t, has_issuer, id_match_t,
}
METHOD(certificate_t, issued_by, bool,
private_x509_crl_t *this, certificate_t *issuer)
private_x509_crl_t *this, certificate_t *issuer, signature_scheme_t *schemep)
{
public_key_t *key;
signature_scheme_t scheme;
@@ -490,6 +490,10 @@ METHOD(certificate_t, issued_by, bool,
}
valid = key->verify(key, scheme, this->tbsCertList, this->signature);
key->destroy(key);
if (valid && schemep)
{
*schemep = scheme;
}
return valid;
}
src/libstrongswan/plugins/x509/x509_ocsp_request.c
+2 -1
View File
@@ -364,7 +364,8 @@ METHOD(certificate_t, has_issuer, id_match_t,
}
METHOD(certificate_t, issued_by, bool,
private_x509_ocsp_request_t *this, certificate_t *issuer)
private_x509_ocsp_request_t *this, certificate_t *issuer,
signature_scheme_t *scheme)
{
DBG1(DBG_LIB, "OCSP request validation not implemented!");
return FALSE;
src/libstrongswan/plugins/x509/x509_ocsp_response.c
+6 -1
View File
@@ -670,7 +670,8 @@ METHOD(certificate_t, has_issuer, id_match_t,
}
METHOD(certificate_t, issued_by, bool,
private_x509_ocsp_response_t *this, certificate_t *issuer)
private_x509_ocsp_response_t *this, certificate_t *issuer,
signature_scheme_t *schemep)
{
public_key_t *key;
signature_scheme_t scheme;
@@ -722,6 +723,10 @@ METHOD(certificate_t, issued_by, bool,
}
valid = key->verify(key, scheme, this->tbsResponseData, this->signature);
key->destroy(key);
if (valid && schemep)
{
*schemep = scheme;
}
return valid;
}
src/libstrongswan/plugins/x509/x509_pkcs10.c
+11 -4
View File
@@ -123,10 +123,12 @@ METHOD(certificate_t, has_subject, id_match_t,
}
METHOD(certificate_t, issued_by, bool,
private_x509_pkcs10_t *this, certificate_t *issuer)
private_x509_pkcs10_t *this, certificate_t *issuer,
signature_scheme_t *schemep)
{
public_key_t *key;
signature_scheme_t scheme;
bool valid;
if (&this->public.interface.interface != issuer)
{
@@ -150,8 +152,13 @@ METHOD(certificate_t, issued_by, bool,
{
return FALSE;
}
return key->verify(key, scheme, this->certificationRequestInfo,
this->signature);
valid = key->verify(key, scheme, this->certificationRequestInfo,
this->signature);
if (valid && schemep)
{
*schemep = scheme;
}
return valid;
}
METHOD(certificate_t, get_public_key, public_key_t*,
@@ -441,7 +448,7 @@ end:
if (success)
{
/* check if the certificate request is self-signed */
if (issued_by(this, &this->public.interface.interface))
if (issued_by(this, &this->public.interface.interface, NULL))
{
this->self_signed = TRUE;
}