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

Whitespace cleanup.

Browse Source
This commit is contained in:
Tobias Brunner
2009-12-23 17:03:41 +01:00
parent 4ec2c94b5d
commit 89ec5bef08
3 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/kernel_klips/kernel_klips_ipsec.c
+17 -17
View File
@@ -88,7 +88,7 @@ struct ipsectunnelconf
__u32 cf_cmd; __u32 cf_cmd;
union union
{ {
char cfu_name[12]; char cfu_name[12];
} cf_u; } cf_u;
#define cf_name cf_u.cfu_name #define cf_name cf_u.cfu_name
}; };
@@ -774,32 +774,32 @@ struct kernel_algorithm_t {
* Algorithms for encryption * Algorithms for encryption
*/ */
static kernel_algorithm_t encryption_algs[] = { static kernel_algorithm_t encryption_algs[] = {
/* {ENCR_DES_IV64, 0 }, */ /* {ENCR_DES_IV64, 0 }, */
{ENCR_DES, SADB_EALG_DESCBC }, {ENCR_DES, SADB_EALG_DESCBC },
{ENCR_3DES, SADB_EALG_3DESCBC }, {ENCR_3DES, SADB_EALG_3DESCBC },
/* {ENCR_RC5, 0 }, */ /* {ENCR_RC5, 0 }, */
/* {ENCR_IDEA, 0 }, */ /* {ENCR_IDEA, 0 }, */
/* {ENCR_CAST, 0 }, */ /* {ENCR_CAST, 0 }, */
{ENCR_BLOWFISH, SADB_EALG_BFCBC }, {ENCR_BLOWFISH, SADB_EALG_BFCBC },
/* {ENCR_3IDEA, 0 }, */ /* {ENCR_3IDEA, 0 }, */
/* {ENCR_DES_IV32, 0 }, */ /* {ENCR_DES_IV32, 0 }, */
{ENCR_NULL, SADB_EALG_NULL }, {ENCR_NULL, SADB_EALG_NULL },
{ENCR_AES_CBC, SADB_EALG_AESCBC }, {ENCR_AES_CBC, SADB_EALG_AESCBC },
/* {ENCR_AES_CTR, 0 }, */ /* {ENCR_AES_CTR, 0 }, */
/* {ENCR_AES_CCM_ICV8, 0 }, */ /* {ENCR_AES_CCM_ICV8, 0 }, */
/* {ENCR_AES_CCM_ICV12, 0 }, */ /* {ENCR_AES_CCM_ICV12, 0 }, */
/* {ENCR_AES_CCM_ICV16, 0 }, */ /* {ENCR_AES_CCM_ICV16, 0 }, */
/* {ENCR_AES_GCM_ICV8, 0 }, */ /* {ENCR_AES_GCM_ICV8, 0 }, */
/* {ENCR_AES_GCM_ICV12, 0 }, */ /* {ENCR_AES_GCM_ICV12, 0 }, */
/* {ENCR_AES_GCM_ICV16, 0 }, */ /* {ENCR_AES_GCM_ICV16, 0 }, */
{END_OF_LIST, 0 }, {END_OF_LIST, 0 },
}; };
/** /**
* Algorithms for integrity protection * Algorithms for integrity protection
*/ */
static kernel_algorithm_t integrity_algs[] = { static kernel_algorithm_t integrity_algs[] = {
{AUTH_HMAC_MD5_96, SADB_AALG_MD5HMAC }, {AUTH_HMAC_MD5_96, SADB_AALG_MD5HMAC },
{AUTH_HMAC_SHA1_96, SADB_AALG_SHA1HMAC }, {AUTH_HMAC_SHA1_96, SADB_AALG_SHA1HMAC },
{AUTH_HMAC_SHA2_256_128, SADB_AALG_SHA256_HMAC }, {AUTH_HMAC_SHA2_256_128, SADB_AALG_SHA256_HMAC },
{AUTH_HMAC_SHA2_384_192, SADB_AALG_SHA384_HMAC }, {AUTH_HMAC_SHA2_384_192, SADB_AALG_SHA384_HMAC },
@@ -807,7 +807,7 @@ static kernel_algorithm_t integrity_algs[] = {
/* {AUTH_DES_MAC, 0, }, */ /* {AUTH_DES_MAC, 0, }, */
/* {AUTH_KPDK_MD5, 0, }, */ /* {AUTH_KPDK_MD5, 0, }, */
/* {AUTH_AES_XCBC_96, 0, }, */ /* {AUTH_AES_XCBC_96, 0, }, */
{END_OF_LIST, 0, }, {END_OF_LIST, 0, },
}; };
#if 0 #if 0
@@ -815,11 +815,11 @@ static kernel_algorithm_t integrity_algs[] = {
* Algorithms for IPComp, unused yet * Algorithms for IPComp, unused yet
*/ */
static kernel_algorithm_t compression_algs[] = { static kernel_algorithm_t compression_algs[] = {
/* {IPCOMP_OUI, 0 }, */ /* {IPCOMP_OUI, 0 }, */
{IPCOMP_DEFLATE, SADB_X_CALG_DEFLATE }, {IPCOMP_DEFLATE, SADB_X_CALG_DEFLATE },
{IPCOMP_LZS, SADB_X_CALG_LZS }, {IPCOMP_LZS, SADB_X_CALG_LZS },
/* {IPCOMP_LZJH, 0 }, */ /* {IPCOMP_LZJH, 0 }, */
{END_OF_LIST, 0 }, {END_OF_LIST, 0 },
}; };
#endif #endif
src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+16 -16
View File
@@ -163,18 +163,18 @@ ENUM(xfrm_attr_type_names, XFRMA_UNSPEC, XFRMA_KMADDRESS,
* Algorithms for encryption * Algorithms for encryption
*/ */
static kernel_algorithm_t encryption_algs[] = { static kernel_algorithm_t encryption_algs[] = {
/* {ENCR_DES_IV64, "***" }, */ /* {ENCR_DES_IV64, "***" }, */
{ENCR_DES, "des" }, {ENCR_DES, "des" },
{ENCR_3DES, "des3_ede" }, {ENCR_3DES, "des3_ede" },
/* {ENCR_RC5, "***" }, */ /* {ENCR_RC5, "***" }, */
/* {ENCR_IDEA, "***" }, */ /* {ENCR_IDEA, "***" }, */
{ENCR_CAST, "cast128" }, {ENCR_CAST, "cast128" },
{ENCR_BLOWFISH, "blowfish" }, {ENCR_BLOWFISH, "blowfish" },
/* {ENCR_3IDEA, "***" }, */ /* {ENCR_3IDEA, "***" }, */
/* {ENCR_DES_IV32, "***" }, */ /* {ENCR_DES_IV32, "***" }, */
{ENCR_NULL, "cipher_null" }, {ENCR_NULL, "cipher_null" },
{ENCR_AES_CBC, "aes" }, {ENCR_AES_CBC, "aes" },
{ENCR_AES_CTR, "rfc3686(ctr(aes))" }, {ENCR_AES_CTR, "rfc3686(ctr(aes))" },
{ENCR_AES_CCM_ICV8, "rfc4309(ccm(aes))" }, {ENCR_AES_CCM_ICV8, "rfc4309(ccm(aes))" },
{ENCR_AES_CCM_ICV12, "rfc4309(ccm(aes))" }, {ENCR_AES_CCM_ICV12, "rfc4309(ccm(aes))" },
{ENCR_AES_CCM_ICV16, "rfc4309(ccm(aes))" }, {ENCR_AES_CCM_ICV16, "rfc4309(ccm(aes))" },
@@ -187,14 +187,14 @@ static kernel_algorithm_t encryption_algs[] = {
/* {ENCR_CAMELLIA_CCM_ICV8, "***" }, */ /* {ENCR_CAMELLIA_CCM_ICV8, "***" }, */
/* {ENCR_CAMELLIA_CCM_ICV12, "***" }, */ /* {ENCR_CAMELLIA_CCM_ICV12, "***" }, */
/* {ENCR_CAMELLIA_CCM_ICV16, "***" }, */ /* {ENCR_CAMELLIA_CCM_ICV16, "***" }, */
{END_OF_LIST, NULL } {END_OF_LIST, NULL }
}; };
/** /**
* Algorithms for integrity protection * Algorithms for integrity protection
*/ */
static kernel_algorithm_t integrity_algs[] = { static kernel_algorithm_t integrity_algs[] = {
{AUTH_HMAC_MD5_96, "md5" }, {AUTH_HMAC_MD5_96, "md5" },
{AUTH_HMAC_SHA1_96, "sha1" }, {AUTH_HMAC_SHA1_96, "sha1" },
{AUTH_HMAC_SHA2_256_96, "sha256" }, {AUTH_HMAC_SHA2_256_96, "sha256" },
{AUTH_HMAC_SHA2_256_128, "hmac(sha256)" }, {AUTH_HMAC_SHA2_256_128, "hmac(sha256)" },
@@ -203,18 +203,18 @@ static kernel_algorithm_t integrity_algs[] = {
/* {AUTH_DES_MAC, "***" }, */ /* {AUTH_DES_MAC, "***" }, */
/* {AUTH_KPDK_MD5, "***" }, */ /* {AUTH_KPDK_MD5, "***" }, */
{AUTH_AES_XCBC_96, "xcbc(aes)" }, {AUTH_AES_XCBC_96, "xcbc(aes)" },
{END_OF_LIST, NULL } {END_OF_LIST, NULL }
}; };
/** /**
* Algorithms for IPComp * Algorithms for IPComp
*/ */
static kernel_algorithm_t compression_algs[] = { static kernel_algorithm_t compression_algs[] = {
/* {IPCOMP_OUI, "***" }, */ /* {IPCOMP_OUI, "***" }, */
{IPCOMP_DEFLATE, "deflate" }, {IPCOMP_DEFLATE, "deflate" },
{IPCOMP_LZS, "lzs" }, {IPCOMP_LZS, "lzs" },
{IPCOMP_LZJH, "lzjh" }, {IPCOMP_LZJH, "lzjh" },
{END_OF_LIST, NULL } {END_OF_LIST, NULL }
}; };
/** /**
src/libstrongswan/asn1/asn1.c
+10 -10
View File
@@ -448,11 +448,11 @@ bool asn1_parse_simple_object(chunk_t *object, asn1_t type, u_int level, const c
* ASN.1 definition of an algorithmIdentifier * ASN.1 definition of an algorithmIdentifier
*/ */
static const asn1Object_t algorithmIdentifierObjects[] = { static const asn1Object_t algorithmIdentifierObjects[] = {
{ 0, "algorithmIdentifier", ASN1_SEQUENCE, ASN1_NONE }, /* 0 */ { 0, "algorithmIdentifier", ASN1_SEQUENCE, ASN1_NONE }, /* 0 */
{ 1, "algorithm", ASN1_OID, ASN1_BODY }, /* 1 */ { 1, "algorithm", ASN1_OID, ASN1_BODY }, /* 1 */
{ 1, "parameters", ASN1_EOC, ASN1_RAW|ASN1_OPT }, /* 2 */ { 1, "parameters", ASN1_EOC, ASN1_RAW|ASN1_OPT }, /* 2 */
{ 1, "end opt", ASN1_EOC, ASN1_END }, /* 3 */ { 1, "end opt", ASN1_EOC, ASN1_END }, /* 3 */
{ 0, "exit", ASN1_EOC, ASN1_EXIT } { 0, "exit", ASN1_EOC, ASN1_EXIT }
}; };
#define ALGORITHM_ID_ALG 1 #define ALGORITHM_ID_ALG 1
#define ALGORITHM_ID_PARAMETERS 2 #define ALGORITHM_ID_PARAMETERS 2
@@ -723,11 +723,11 @@ chunk_t asn1_wrap(asn1_t type, const char *mode, ...)
* ASN.1 definition of time * ASN.1 definition of time
*/ */
static const asn1Object_t timeObjects[] = { static const asn1Object_t timeObjects[] = {
{ 0, "utcTime", ASN1_UTCTIME, ASN1_OPT|ASN1_BODY }, /* 0 */ { 0, "utcTime", ASN1_UTCTIME, ASN1_OPT|ASN1_BODY }, /* 0 */
{ 0, "end opt", ASN1_EOC, ASN1_END }, /* 1 */ { 0, "end opt", ASN1_EOC, ASN1_END }, /* 1 */
{ 0, "generalizeTime", ASN1_GENERALIZEDTIME, ASN1_OPT|ASN1_BODY }, /* 2 */ { 0, "generalizeTime", ASN1_GENERALIZEDTIME, ASN1_OPT|ASN1_BODY }, /* 2 */
{ 0, "end opt", ASN1_EOC, ASN1_END }, /* 3 */ { 0, "end opt", ASN1_EOC, ASN1_END }, /* 3 */
{ 0, "exit", ASN1_EOC, ASN1_EXIT } { 0, "exit", ASN1_EOC, ASN1_EXIT }
}; };
#define TIME_UTC 0 #define TIME_UTC 0
#define TIME_GENERALIZED 2 #define TIME_GENERALIZED 2