projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix client verify mode to check SSL_VERIFY_PEER
[oweals/openssl.git]
/
include
/
openssl
/
camellia.h
diff --git
a/include/openssl/camellia.h
b/include/openssl/camellia.h
index 3736d3a4533dba5b8d9856e9d2d2f9850380f050..d05b39254908bf0be9188e6ae9cca0efbd78c76e 100644
(file)
--- a/
include/openssl/camellia.h
+++ b/
include/openssl/camellia.h
@@
-1,4
+1,3
@@
-/* crypto/camellia/camellia.h */
/* ====================================================================
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
*
/* ====================================================================
* Copyright (c) 2006 The OpenSSL Project. All rights reserved.
*
@@
-54,11
+53,11
@@
# include <openssl/opensslconf.h>
# include <openssl/opensslconf.h>
-# ifdef OPENSSL_NO_CAMELLIA
-# error CAMELLIA is disabled.
-# endif
-
+# ifndef OPENSSL_NO_CAMELLIA
# include <stddef.h>
# include <stddef.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
# define CAMELLIA_ENCRYPT 1
# define CAMELLIA_DECRYPT 0
# define CAMELLIA_ENCRYPT 1
# define CAMELLIA_DECRYPT 0
@@
-68,10
+67,6
@@
* Both sizes are in bytes.
*/
* Both sizes are in bytes.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/* This should be a hidden type, but EVP requires that the size be known */
# define CAMELLIA_BLOCK_SIZE 16
/* This should be a hidden type, but EVP requires that the size be known */
# define CAMELLIA_BLOCK_SIZE 16
@@
-121,8
+116,9
@@
void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
unsigned int *num);
unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
unsigned int *num);
-#ifdef __cplusplus
+#
ifdef __cplusplus
}
}
-#endif
+# endif
+# endif
-#endif
/* !HEADER_Camellia_H */
+#endif