diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2006-12-27 15:05:53 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2006-12-27 15:05:53 +0000 |
| commit | 78249ef8bf5c265d0ef025fb995d17ac46042d74 (patch) | |
| tree | 96e5da11a212bf7acf1b73b3f916ee4f5393625b | |
| parent | 97c351749d23e3eb41c973ed5197a59f053ffaf3 (diff) | |
default encryption type is AES-128, rearranged code so that is clearer (let
default handling be at the end)
| -rw-r--r-- | lasso/xml/xml.c | 14 | ||||
| -rw-r--r-- | lasso/xml/xml_enc.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c index db5ac285..195198bd 100644 --- a/lasso/xml/xml.c +++ b/lasso/xml/xml.c @@ -445,13 +445,13 @@ lasso_node_encrypt(LassoNode *lasso_node, xmlSecKey *encryption_public_key, case LASSO_ENCRYPTION_SYM_KEY_TYPE_AES_256: xmlsec_encryption_sym_key_type = xmlSecTransformAes256CbcId; break; + case LASSO_ENCRYPTION_SYM_KEY_TYPE_3DES: + xmlsec_encryption_sym_key_type = xmlSecTransformDes3CbcId; + break; case LASSO_ENCRYPTION_SYM_KEY_TYPE_AES_128: default: xmlsec_encryption_sym_key_type = xmlSecTransformAes128CbcId; break; - case LASSO_ENCRYPTION_SYM_KEY_TYPE_3DES: - xmlsec_encryption_sym_key_type = xmlSecTransformDes3CbcId; - break; } /* Create encryption template for a specific symetric key type */ @@ -538,15 +538,15 @@ lasso_node_encrypt(LassoNode *lasso_node, xmlSecKey *encryption_public_key, enc_ctx->encKey = xmlSecKeyGenerate(xmlSecKeyDataAesId, 256, xmlSecKeyDataTypeSession); break; + case LASSO_ENCRYPTION_SYM_KEY_TYPE_3DES: + enc_ctx->encKey = xmlSecKeyGenerate(xmlSecKeyDataDesId, 192, + xmlSecKeyDataTypeSession); + break; case LASSO_ENCRYPTION_SYM_KEY_TYPE_AES_128: default: enc_ctx->encKey = xmlSecKeyGenerate(xmlSecKeyDataAesId, 128, xmlSecKeyDataTypeSession); break; - case LASSO_ENCRYPTION_SYM_KEY_TYPE_3DES: - enc_ctx->encKey = xmlSecKeyGenerate(xmlSecKeyDataDesId, 192, - xmlSecKeyDataTypeSession); - break; } if (enc_ctx->encKey == NULL) { diff --git a/lasso/xml/xml_enc.h b/lasso/xml/xml_enc.h index b1250326..c4f4fc80 100644 --- a/lasso/xml/xml_enc.h +++ b/lasso/xml/xml_enc.h @@ -34,7 +34,7 @@ extern "C" { /** * LassoEncryptionSymKeyType: - * @LASSO_ENCRYPTION_SYM_KEY_TYPE_DEFAULT : Default type (Aes 256) + * @LASSO_ENCRYPTION_SYM_KEY_TYPE_DEFAULT : Default type (AES 128) * @LASSO_ENCRYPTION_SYM_KEY_TYPE_AES_256 : Aes 256 bits key * @LASSO_ENCRYPTION_SYM_KEY_TYPE_AES_128 : Aes 128 bits key * @LASSO_ENCRYPTION_SYM_KEY_TYPE_3DES : Triple DES 192 bits key |