summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/camellia/cmll_misc.c
diff options
context:
space:
mode:
authordjm <>2012-10-13 21:23:50 +0000
committerdjm <>2012-10-13 21:23:50 +0000
commit228cae30b117c2493f69ad3c195341cd6ec8d430 (patch)
tree29ff00b10d52c0978077c4fd83c33b065bade73e /src/lib/libcrypto/camellia/cmll_misc.c
parent731838c66b52c0ae5888333005b74115a620aa96 (diff)
downloadopenbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.gz
openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.bz2
openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.zip
import OpenSSL-1.0.1c
Diffstat (limited to 'src/lib/libcrypto/camellia/cmll_misc.c')
-rw-r--r--src/lib/libcrypto/camellia/cmll_misc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/camellia/cmll_misc.c b/src/lib/libcrypto/camellia/cmll_misc.c
index f44689124b..f44d48564c 100644
--- a/src/lib/libcrypto/camellia/cmll_misc.c
+++ b/src/lib/libcrypto/camellia/cmll_misc.c
@@ -50,12 +50,13 @@
50 */ 50 */
51 51
52#include <openssl/opensslv.h> 52#include <openssl/opensslv.h>
53#include <openssl/crypto.h>
53#include <openssl/camellia.h> 54#include <openssl/camellia.h>
54#include "cmll_locl.h" 55#include "cmll_locl.h"
55 56
56const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT; 57const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT;
57 58
58int Camellia_set_key(const unsigned char *userKey, const int bits, 59int private_Camellia_set_key(const unsigned char *userKey, const int bits,
59 CAMELLIA_KEY *key) 60 CAMELLIA_KEY *key)
60 { 61 {
61 if(!userKey || !key) 62 if(!userKey || !key)