pluto: Some whitespace cleanup.
This commit is contained in:
parent
6224a34481
commit
19e12db79c
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue