aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/camellia/cmll_utl.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-02-22 14:43:31 +0100
committermarha <marha@users.sourceforge.net>2015-02-22 14:43:31 +0100
commitc9aad1ae6227c434d480d1d3aa8eae3c3c910c18 (patch)
tree94b917df998c3d547e191b3b9c58bbffc616470e /openssl/crypto/camellia/cmll_utl.c
parentf1c2db43dcf35d2cf4715390bd2391c28e42a8c2 (diff)
downloadvcxsrv-c9aad1ae6227c434d480d1d3aa8eae3c3c910c18.tar.gz
vcxsrv-c9aad1ae6227c434d480d1d3aa8eae3c3c910c18.tar.bz2
vcxsrv-c9aad1ae6227c434d480d1d3aa8eae3c3c910c18.zip
Upgraded to openssl-1.0.2
Diffstat (limited to 'openssl/crypto/camellia/cmll_utl.c')
-rw-r--r--openssl/crypto/camellia/cmll_utl.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/openssl/crypto/camellia/cmll_utl.c b/openssl/crypto/camellia/cmll_utl.c
index 7a35711ec..d19ee1931 100644
--- a/openssl/crypto/camellia/cmll_utl.c
+++ b/openssl/crypto/camellia/cmll_utl.c
@@ -7,7 +7,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -48,17 +48,17 @@
* ====================================================================
*
*/
-
+
#include <openssl/opensslv.h>
#include <openssl/crypto.h>
#include <openssl/camellia.h>
#include "cmll_locl.h"
int Camellia_set_key(const unsigned char *userKey, const int bits,
- CAMELLIA_KEY *key)
- {
+ CAMELLIA_KEY *key)
+{
#ifdef OPENSSL_FIPS
- fips_cipher_abort(Camellia);
+ fips_cipher_abort(Camellia);
#endif
- return private_Camellia_set_key(userKey, bits, key);
- }
+ return private_Camellia_set_key(userKey, bits, key);
+}