diff options
Diffstat (limited to 'src/libstrongswan/crypto')
-rw-r--r-- | src/libstrongswan/crypto/crypters/crypter.h | 4 | ||||
-rw-r--r-- | src/libstrongswan/crypto/crypto_factory.c | 2 | ||||
-rw-r--r-- | src/libstrongswan/crypto/pkcs7.c | 6 | ||||
-rw-r--r-- | src/libstrongswan/crypto/pkcs9.c | 4 | ||||
-rw-r--r-- | src/libstrongswan/crypto/proposal/proposal_keywords.h | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/libstrongswan/crypto/crypters/crypter.h b/src/libstrongswan/crypto/crypters/crypter.h index dc3c3a7ff..db7b267ea 100644 --- a/src/libstrongswan/crypto/crypters/crypter.h +++ b/src/libstrongswan/crypto/crypters/crypter.h @@ -56,9 +56,9 @@ enum encryption_algorithm_t { ENCR_CAMELLIA_CCM_ICV12 = 26, ENCR_CAMELLIA_CCM_ICV16 = 27, ENCR_UNDEFINED = 1024, - ENCR_DES_ECB = 1025, + ENCR_DES_ECB = 1025, ENCR_SERPENT_CBC = 1026, - ENCR_TWOFISH_CBC = 1027 + ENCR_TWOFISH_CBC = 1027 }; #define DES_BLOCK_SIZE 8 diff --git a/src/libstrongswan/crypto/crypto_factory.c b/src/libstrongswan/crypto/crypto_factory.c index ceb44b0b3..9bc986f68 100644 --- a/src/libstrongswan/crypto/crypto_factory.c +++ b/src/libstrongswan/crypto/crypto_factory.c @@ -116,7 +116,7 @@ static crypter_t* create_crypter(private_crypto_factory_t *this, { if (this->test_on_create && !this->tester->test_crypter(this->tester, algo, key_size, - entry->create_crypter)) + entry->create_crypter)) { continue; } diff --git a/src/libstrongswan/crypto/pkcs7.c b/src/libstrongswan/crypto/pkcs7.c index f3ec2d839..d8d2684b0 100644 --- a/src/libstrongswan/crypto/pkcs7.c +++ b/src/libstrongswan/crypto/pkcs7.c @@ -727,7 +727,7 @@ chunk_t pkcs7_build_issuerAndSerialNumber(x509_t *cert) { identification_t *issuer = cert->get_issuer(cert); - return asn1_wrap(ASN1_SEQUENCE, "cm", + return asn1_wrap(ASN1_SEQUENCE, "cm", issuer->get_encoding(issuer), asn1_simple_object(ASN1_INTEGER, cert->get_serialNumber(cert))); } @@ -806,7 +806,7 @@ bool build_envelopedData(private_pkcs7_t *this, x509_t *cert, crypter->encrypt(crypter, in, iv, &out); crypter->destroy(crypter); chunk_clear(&in); - DBG3(" encrypted data: %B", &out); + DBG3(" encrypted data: %B", &out); /* build pkcs7 enveloped data object */ { @@ -839,7 +839,7 @@ bool build_envelopedData(private_pkcs7_t *this, x509_t *cert, asn1_wrap(ASN1_SET, "m", recipientInfo), encryptedContentInfo); this->type = OID_PKCS7_ENVELOPED_DATA; - } + } return TRUE; } diff --git a/src/libstrongswan/crypto/pkcs9.c b/src/libstrongswan/crypto/pkcs9.c index 9585e54f1..cb99ccd85 100644 --- a/src/libstrongswan/crypto/pkcs9.c +++ b/src/libstrongswan/crypto/pkcs9.c @@ -249,7 +249,7 @@ static void build_encoding(private_pkcs9_t *this) while (iterator->iterate(iterator, (void**)&attribute)) { memcpy(pos, attribute->encoding.ptr, attribute->encoding.len); - pos += attribute->encoding.len; + pos += attribute->encoding.len; } iterator->destroy(iterator); } @@ -428,7 +428,7 @@ static bool parse_attributes(chunk_t chunk, int level0, private_pkcs9_t* this) if (type != ASN1_EOC) { - if (!asn1_parse_simple_object(&object, type, + if (!asn1_parse_simple_object(&object, type, parser->get_level(parser)+1, oid_names[oid].name)) { diff --git a/src/libstrongswan/crypto/proposal/proposal_keywords.h b/src/libstrongswan/crypto/proposal/proposal_keywords.h index fb2c84630..53fa1728f 100644 --- a/src/libstrongswan/crypto/proposal/proposal_keywords.h +++ b/src/libstrongswan/crypto/proposal/proposal_keywords.h @@ -21,10 +21,10 @@ typedef struct proposal_token proposal_token_t; struct proposal_token { - char *name; - transform_type_t type; + char *name; + transform_type_t type; u_int16_t algorithm; - u_int16_t keysize; + u_int16_t keysize; }; extern const proposal_token_t* proposal_get_token(register const char *str, |