diff options
Diffstat (limited to 'src/pluto')
| -rw-r--r-- | src/pluto/ac.c | 4 | ||||
| -rw-r--r-- | src/pluto/alg_info.c | 2 | ||||
| -rw-r--r-- | src/pluto/crl.c | 2 | ||||
| -rw-r--r-- | src/pluto/kernel.c | 4 | ||||
| -rw-r--r-- | src/pluto/ocsp.c | 2 | ||||
| -rw-r--r-- | src/pluto/pkcs7.c | 2 | ||||
| -rw-r--r-- | src/pluto/vendor.c | 2 | ||||
| -rw-r--r-- | src/pluto/x509.c | 10 |
8 files changed, 14 insertions, 14 deletions
diff --git a/src/pluto/ac.c b/src/pluto/ac.c index 769d77e83..5594569a4 100644 --- a/src/pluto/ac.c +++ b/src/pluto/ac.c @@ -123,7 +123,7 @@ static const asn1Object_t acObjects[] = { 3, "baseCertificateID", ASN1_CONTEXT_C_0, ASN1_OPT }, /* 21 */ { 4, "issuerSerial", ASN1_SEQUENCE, ASN1_NONE }, /* 22 */ { 5, "issuer", ASN1_SEQUENCE, ASN1_OBJ }, /* 23 */ - { 5, "serial", ASN1_INTEGER, ASN1_BODY }, /* 24 */ + { 5, "serial", ASN1_INTEGER, ASN1_BODY }, /* 24 */ { 5, "issuerUID", ASN1_BIT_STRING, ASN1_OPT | ASN1_BODY }, /* 25 */ { 5, "end opt", ASN1_EOC, ASN1_END }, /* 26 */ @@ -131,7 +131,7 @@ static const asn1Object_t acObjects[] = { 3, "objectDigestInfo", ASN1_CONTEXT_C_1, ASN1_OPT }, /* 28 */ { 4, "digestInfo", ASN1_SEQUENCE, ASN1_OBJ }, /* 29 */ { 5, "digestedObjectType", ASN1_ENUMERATED, ASN1_BODY }, /* 30 */ - { 5, "otherObjectTypeID", ASN1_OID, ASN1_OPT | + { 5, "otherObjectTypeID", ASN1_OID, ASN1_OPT | ASN1_BODY }, /* 31 */ { 5, "end opt", ASN1_EOC, ASN1_END }, /* 32 */ { 5, "digestAlgorithm", ASN1_EOC, ASN1_RAW }, /* 33 */ diff --git a/src/pluto/alg_info.c b/src/pluto/alg_info.c index e8f977950..1cc2d189e 100644 --- a/src/pluto/alg_info.c +++ b/src/pluto/alg_info.c @@ -397,7 +397,7 @@ static status_t alg_info_parse_str(struct alg_info *alg_info, char *alg_str) { case PROTO_IPSEC_ESP: alg_info_esp_add(alg_info, ealg, ealg_keysize, - aalg, aalg_keysize); + aalg, aalg_keysize); break; case PROTO_ISAKMP: alg_info_ike_add(alg_info, ealg, ealg_keysize, diff --git a/src/pluto/crl.c b/src/pluto/crl.c index 4a7accae7..84d58ab85 100644 --- a/src/pluto/crl.c +++ b/src/pluto/crl.c @@ -66,7 +66,7 @@ static const asn1Object_t crlObjects[] = { { 4, "userCertificate", ASN1_INTEGER, ASN1_BODY }, /* 10 */ { 4, "revocationDate", ASN1_EOC, ASN1_RAW }, /* 11 */ { 4, "crlEntryExtensions", ASN1_SEQUENCE, ASN1_OPT | - ASN1_LOOP }, /* 12 */ + ASN1_LOOP }, /* 12 */ { 5, "extension", ASN1_SEQUENCE, ASN1_NONE }, /* 13 */ { 6, "extnID", ASN1_OID, ASN1_BODY }, /* 14 */ { 6, "critical", ASN1_BOOLEAN, ASN1_DEF | diff --git a/src/pluto/kernel.c b/src/pluto/kernel.c index f9972599b..46c0b399a 100644 --- a/src/pluto/kernel.c +++ b/src/pluto/kernel.c @@ -942,8 +942,8 @@ static bool raw_eroute(const ip_address *this_host, const ip_subnet *this_client, const ip_address *that_host, const ip_subnet *that_client, - ipsec_spi_t spi, - unsigned int proto, + ipsec_spi_t spi, + unsigned int proto, unsigned int satype, unsigned int transport_proto, const struct pfkey_proto_info *proto_info, diff --git a/src/pluto/ocsp.c b/src/pluto/ocsp.c index 4be3298ae..378955c06 100644 --- a/src/pluto/ocsp.c +++ b/src/pluto/ocsp.c @@ -1536,7 +1536,7 @@ void parse_ocsp(ocsp_location_t *location, chunk_t blob) single_response_t sres = empty_single_response; if (!parse_ocsp_single_response(object, - parser->get_level(parser)+1, &sres)) + parser->get_level(parser)+1, &sres)) { goto end; } diff --git a/src/pluto/pkcs7.c b/src/pluto/pkcs7.c index e6b085f78..edeb5ae12 100644 --- a/src/pluto/pkcs7.c +++ b/src/pluto/pkcs7.c @@ -758,7 +758,7 @@ chunk_t pkcs7_build_envelopedData(chunk_t data, const x509cert_t *cert, int enc_ in.ptr = malloc(in.len); DBG2("padding %u bytes of data to multiple block size of %u bytes", - data.len, in.len); + data.len, in.len); /* copy data */ memcpy(in.ptr, data.ptr, data.len); diff --git a/src/pluto/vendor.c b/src/pluto/vendor.c index 8c1aaf0b8..e9353f856 100644 --- a/src/pluto/vendor.c +++ b/src/pluto/vendor.c @@ -341,7 +341,7 @@ void init_vendorid(void) chunk_t vid_data = { (u_char *)vid->data, strlen(vid->data) }; /** VendorID is a string to hash with MD5 **/ - hasher->allocate_hash(hasher, vid_data, &vid->vid); + hasher->allocate_hash(hasher, vid_data, &vid->vid); } if (vid->descr == NULL) diff --git a/src/pluto/x509.c b/src/pluto/x509.c index 50322da88..9d4448c94 100644 --- a/src/pluto/x509.c +++ b/src/pluto/x509.c @@ -137,10 +137,10 @@ static const asn1Object_t generalNameObjects[] = { { 0, "end choice", ASN1_EOC, ASN1_END }, /* 17 */ { 0, "exit", ASN1_EOC, ASN1_EXIT } }; -#define GN_OBJ_OTHER_NAME 0 -#define GN_OBJ_RFC822_NAME 2 -#define GN_OBJ_DNS_NAME 4 -#define GN_OBJ_X400_ADDRESS 6 +#define GN_OBJ_OTHER_NAME 0 +#define GN_OBJ_RFC822_NAME 2 +#define GN_OBJ_DNS_NAME 4 +#define GN_OBJ_X400_ADDRESS 6 #define GN_OBJ_DIRECTORY_NAME 8 #define GN_OBJ_EDI_PARTY_NAME 10 #define GN_OBJ_URI 12 @@ -1595,7 +1595,7 @@ void parse_authorityKeyIdentifier(chunk_t blob, int level0, case AUTH_KEY_ID_CERT_ISSUER: { generalName_t * gn = parse_generalNames(object, - parser->get_level(parser) + 1, TRUE); + parser->get_level(parser) + 1, TRUE); free_generalNames(gn, FALSE); } |