diff options
author | Tobias Brunner <tobias@strongswan.org> | 2011-08-12 10:39:54 +0200 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2011-08-15 15:53:26 +0200 |
commit | 19e12db79c1f32714a6cea0186909e3c1b0c354b (patch) | |
tree | e8a50f5037310f3e71f61e0aa8738177762d854d /src/pluto | |
parent | 6224a3448112263f6ac76230e3ee174fb6317e4c (diff) | |
download | strongswan-19e12db79c1f32714a6cea0186909e3c1b0c354b.tar.bz2 strongswan-19e12db79c1f32714a6cea0186909e3c1b0c354b.tar.xz |
pluto: Some whitespace cleanup.
Diffstat (limited to 'src/pluto')
-rw-r--r-- | src/pluto/builder.c | 18 | ||||
-rw-r--r-- | src/pluto/ca.c | 4 | ||||
-rw-r--r-- | src/pluto/crypto.c | 2 | ||||
-rw-r--r-- | src/pluto/dnskey.c | 2 | ||||
-rw-r--r-- | src/pluto/myid.c | 2 | ||||
-rw-r--r-- | src/pluto/ocsp.c | 8 | ||||
-rw-r--r-- | src/pluto/vendor.c | 2 |
7 files changed, 19 insertions, 19 deletions
diff --git a/src/pluto/builder.c b/src/pluto/builder.c index d7ec3feb9..a6e05a330 100644 --- a/src/pluto/builder.c +++ b/src/pluto/builder.c @@ -71,17 +71,17 @@ static cert_t *builder_load_cert(certificate_type_t type, va_list args) if (pgp) { cert->cert = lib->creds->create(lib->creds, - CRED_CERTIFICATE, CERT_GPG, - BUILD_BLOB_PGP, blob, - BUILD_END); + CRED_CERTIFICATE, CERT_GPG, + BUILD_BLOB_PGP, blob, + BUILD_END); } else { cert->cert = lib->creds->create(lib->creds, - CRED_CERTIFICATE, CERT_X509, - BUILD_BLOB_ASN1_DER, blob, + CRED_CERTIFICATE, CERT_X509, + BUILD_BLOB_ASN1_DER, blob, BUILD_X509_FLAG, flags, - BUILD_END); + BUILD_END); } if (cert->cert) { @@ -121,9 +121,9 @@ static x509crl_t *builder_load_crl(certificate_type_t type, va_list args) crl->next = NULL; crl->distributionPoints = linked_list_create(); crl->crl = lib->creds->create(lib->creds, - CRED_CERTIFICATE, CERT_X509_CRL, - BUILD_BLOB_ASN1_DER, blob, - BUILD_END); + CRED_CERTIFICATE, CERT_X509_CRL, + BUILD_BLOB_ASN1_DER, blob, + BUILD_END); if (crl->crl) { return crl; diff --git a/src/pluto/ca.c b/src/pluto/ca.c index add85def8..175c0b022 100644 --- a/src/pluto/ca.c +++ b/src/pluto/ca.c @@ -87,7 +87,7 @@ bool trusted_ca(identification_t *a, identification_t *b, int *pathlen) break; } certificate = cacert->cert; - + /* is the certificate self-signed? */ { x509_t *x509 = (x509_t*)certificate; @@ -248,7 +248,7 @@ cert_t* add_authcert(cert_t *cert, x509_flag_t auth_flags) lock_authcert_list("add_authcert"); - old_cert = get_authcert(certificate->get_subject(certificate), + old_cert = get_authcert(certificate->get_subject(certificate), x509->get_subjectKeyIdentifier(x509), auth_flags); if (old_cert) diff --git a/src/pluto/crypto.c b/src/pluto/crypto.c index f01966c72..a4f678222 100644 --- a/src/pluto/crypto.c +++ b/src/pluto/crypto.c @@ -30,7 +30,7 @@ static struct encrypt_desc encrypt_desc_3des = algo_id: OAKLEY_3DES_CBC, plugin_name: NULL, algo_next: NULL, - + enc_blocksize: DES_BLOCK_SIZE, keydeflen: DES_BLOCK_SIZE * 3 * BITS_PER_BYTE, keyminlen: DES_BLOCK_SIZE * 3 * BITS_PER_BYTE, diff --git a/src/pluto/dnskey.c b/src/pluto/dnskey.c index 4f8e4ebf4..45d9ad0e2 100644 --- a/src/pluto/dnskey.c +++ b/src/pluto/dnskey.c @@ -1427,7 +1427,7 @@ err_t start_adns_query(identification_t *id, /* domain to query */ cr->sgw_specified = (sgw_id != NULL); cr->sgw_id = cr->sgw_specified ? sgw_id->clone(sgw_id) : - identification_create_from_string("%any"); + identification_create_from_string("%any"); cr->gateways_from_dns = NULL; #ifdef USE_KEYRR cr->keys_from_dns = NULL; diff --git a/src/pluto/myid.c b/src/pluto/myid.c index ad4eefd15..c90d14ef8 100644 --- a/src/pluto/myid.c +++ b/src/pluto/myid.c @@ -72,7 +72,7 @@ void set_myid(enum myid_state s, char *idstr) if (idstr) { myids[s]->destroy(myids[s]); - myids[s] = identification_create_from_string(idstr); + myids[s] = identification_create_from_string(idstr); if (s == MYID_SPECIFIED) { myid_state = MYID_SPECIFIED; diff --git a/src/pluto/ocsp.c b/src/pluto/ocsp.c index f5ee07398..d89bfdf01 100644 --- a/src/pluto/ocsp.c +++ b/src/pluto/ocsp.c @@ -624,7 +624,7 @@ void list_ocsp_locations(ocsp_location_t *location, bool requests, whack_log(RC_COMMENT, " serial: %#B, %s, until %T %s", &certinfo->serialNumber, cert_status_names[certinfo->status], - &certinfo->nextUpdate, utc, + &certinfo->nextUpdate, utc, check_expiry(certinfo->nextUpdate, OCSP_WARNING_INTERVAL, strict)); } certinfo = certinfo->next; @@ -1144,9 +1144,9 @@ static bool parse_basic_ocsp_response(chunk_t blob, int level0, response_t *res) *cert = cert_empty; cert->cert = lib->creds->create(lib->creds, - CRED_CERTIFICATE, CERT_X509, - BUILD_BLOB_ASN1_DER, object, - BUILD_END); + CRED_CERTIFICATE, CERT_X509, + BUILD_BLOB_ASN1_DER, object, + BUILD_END); if (cert->cert == NULL) { DBG(DBG_CONTROL | DBG_PARSING, diff --git a/src/pluto/vendor.c b/src/pluto/vendor.c index 99cfc5734..6cc599d8d 100644 --- a/src/pluto/vendor.c +++ b/src/pluto/vendor.c @@ -346,7 +346,7 @@ static void handle_known_vendorid (struct msg_digest *md, const char *vidstr, case VID_STRONGSWAN: vid_useful = TRUE; break; - + /* Remote side supports OpenPGP certificates */ case VID_OPENPGP: md->openpgp = TRUE; |