pluto: Some whitespace cleanup.

This commit is contained in:
Tobias Brunner
2011-08-15 15:53:26 +02:00
parent 6224a34481
commit 19e12db79c
7 changed files with 19 additions and 19 deletions
+9 -9
View File
@@ -71,17 +71,17 @@ static cert_t *builder_load_cert(certificate_type_t type, va_list args)
if (pgp) if (pgp)
{ {
cert->cert = lib->creds->create(lib->creds, cert->cert = lib->creds->create(lib->creds,
CRED_CERTIFICATE, CERT_GPG, CRED_CERTIFICATE, CERT_GPG,
BUILD_BLOB_PGP, blob, BUILD_BLOB_PGP, blob,
BUILD_END); BUILD_END);
} }
else else
{ {
cert->cert = lib->creds->create(lib->creds, cert->cert = lib->creds->create(lib->creds,
CRED_CERTIFICATE, CERT_X509, CRED_CERTIFICATE, CERT_X509,
BUILD_BLOB_ASN1_DER, blob, BUILD_BLOB_ASN1_DER, blob,
BUILD_X509_FLAG, flags, BUILD_X509_FLAG, flags,
BUILD_END); BUILD_END);
} }
if (cert->cert) if (cert->cert)
{ {
@@ -121,9 +121,9 @@ static x509crl_t *builder_load_crl(certificate_type_t type, va_list args)
crl->next = NULL; crl->next = NULL;
crl->distributionPoints = linked_list_create(); crl->distributionPoints = linked_list_create();
crl->crl = lib->creds->create(lib->creds, crl->crl = lib->creds->create(lib->creds,
CRED_CERTIFICATE, CERT_X509_CRL, CRED_CERTIFICATE, CERT_X509_CRL,
BUILD_BLOB_ASN1_DER, blob, BUILD_BLOB_ASN1_DER, blob,
BUILD_END); BUILD_END);
if (crl->crl) if (crl->crl)
{ {
return crl; return crl;
+2 -2
View File
@@ -87,7 +87,7 @@ bool trusted_ca(identification_t *a, identification_t *b, int *pathlen)
break; break;
} }
certificate = cacert->cert; certificate = cacert->cert;
/* is the certificate self-signed? */ /* is the certificate self-signed? */
{ {
x509_t *x509 = (x509_t*)certificate; 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"); 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), x509->get_subjectKeyIdentifier(x509),
auth_flags); auth_flags);
if (old_cert) if (old_cert)
+1 -1
View File
@@ -30,7 +30,7 @@ static struct encrypt_desc encrypt_desc_3des =
algo_id: OAKLEY_3DES_CBC, algo_id: OAKLEY_3DES_CBC,
plugin_name: NULL, plugin_name: NULL,
algo_next: NULL, algo_next: NULL,
enc_blocksize: DES_BLOCK_SIZE, enc_blocksize: DES_BLOCK_SIZE,
keydeflen: DES_BLOCK_SIZE * 3 * BITS_PER_BYTE, keydeflen: DES_BLOCK_SIZE * 3 * BITS_PER_BYTE,
keyminlen: DES_BLOCK_SIZE * 3 * BITS_PER_BYTE, keyminlen: DES_BLOCK_SIZE * 3 * BITS_PER_BYTE,
+1 -1
View File
@@ -1427,7 +1427,7 @@ err_t start_adns_query(identification_t *id, /* domain to query */
cr->sgw_specified = (sgw_id != NULL); cr->sgw_specified = (sgw_id != NULL);
cr->sgw_id = cr->sgw_specified ? cr->sgw_id = cr->sgw_specified ?
sgw_id->clone(sgw_id) : sgw_id->clone(sgw_id) :
identification_create_from_string("%any"); identification_create_from_string("%any");
cr->gateways_from_dns = NULL; cr->gateways_from_dns = NULL;
#ifdef USE_KEYRR #ifdef USE_KEYRR
cr->keys_from_dns = NULL; cr->keys_from_dns = NULL;
+1 -1
View File
@@ -72,7 +72,7 @@ void set_myid(enum myid_state s, char *idstr)
if (idstr) if (idstr)
{ {
myids[s]->destroy(myids[s]); myids[s]->destroy(myids[s]);
myids[s] = identification_create_from_string(idstr); myids[s] = identification_create_from_string(idstr);
if (s == MYID_SPECIFIED) if (s == MYID_SPECIFIED)
{ {
myid_state = MYID_SPECIFIED; myid_state = MYID_SPECIFIED;
+4 -4
View File
@@ -624,7 +624,7 @@ void list_ocsp_locations(ocsp_location_t *location, bool requests,
whack_log(RC_COMMENT, " serial: %#B, %s, until %T %s", whack_log(RC_COMMENT, " serial: %#B, %s, until %T %s",
&certinfo->serialNumber, &certinfo->serialNumber,
cert_status_names[certinfo->status], cert_status_names[certinfo->status],
&certinfo->nextUpdate, utc, &certinfo->nextUpdate, utc,
check_expiry(certinfo->nextUpdate, OCSP_WARNING_INTERVAL, strict)); check_expiry(certinfo->nextUpdate, OCSP_WARNING_INTERVAL, strict));
} }
certinfo = certinfo->next; 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_empty;
cert->cert = lib->creds->create(lib->creds, cert->cert = lib->creds->create(lib->creds,
CRED_CERTIFICATE, CERT_X509, CRED_CERTIFICATE, CERT_X509,
BUILD_BLOB_ASN1_DER, object, BUILD_BLOB_ASN1_DER, object,
BUILD_END); BUILD_END);
if (cert->cert == NULL) if (cert->cert == NULL)
{ {
DBG(DBG_CONTROL | DBG_PARSING, DBG(DBG_CONTROL | DBG_PARSING,
+1 -1
View File
@@ -346,7 +346,7 @@ static void handle_known_vendorid (struct msg_digest *md, const char *vidstr,
case VID_STRONGSWAN: case VID_STRONGSWAN:
vid_useful = TRUE; vid_useful = TRUE;
break; break;
/* Remote side supports OpenPGP certificates */ /* Remote side supports OpenPGP certificates */
case VID_OPENPGP: case VID_OPENPGP:
md->openpgp = TRUE; md->openpgp = TRUE;