diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-28 01:32:33 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-11-03 13:13:31 +0100 |
| commit | 7dc60ba7c8314109a1eeef3c801c8c41a7ebbeff (patch) | |
| tree | f3a399e505ccdb3df64f593392a670876b68b6b8 /include/openssl/modes.h | |
| parent | f2ae2348cef7cdc9bc7bcff8f5cf19384bad45fd (diff) | |
| download | openssl-7dc60ba7c8314109a1eeef3c801c8c41a7ebbeff.zip openssl-7dc60ba7c8314109a1eeef3c801c8c41a7ebbeff.tar.gz openssl-7dc60ba7c8314109a1eeef3c801c8c41a7ebbeff.tar.bz2 | |
Add a HEADER_MODES_H guard in include/openssl/modes.h
Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)
Diffstat (limited to 'include/openssl/modes.h')
| -rw-r--r-- | include/openssl/modes.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/openssl/modes.h b/include/openssl/modes.h index a04c6a5..d544f98 100644 --- a/include/openssl/modes.h +++ b/include/openssl/modes.h @@ -7,11 +7,14 @@ * https://www.openssl.org/source/license.html */ -#include <stddef.h> +#ifndef HEADER_MODES_H +# define HEADER_MODES_H -#ifdef __cplusplus +# include <stddef.h> + +# ifdef __cplusplus extern "C" { -#endif +# endif typedef void (*block128_f) (const unsigned char in[16], unsigned char out[16], const void *key); @@ -166,7 +169,7 @@ size_t CRYPTO_128_unwrap_pad(void *key, const unsigned char *icv, unsigned char *out, const unsigned char *in, size_t inlen, block128_f block); -#ifndef OPENSSL_NO_OCB +# ifndef OPENSSL_NO_OCB typedef struct ocb128_context OCB128_CONTEXT; typedef void (*ocb128_f) (const unsigned char *in, unsigned char *out, @@ -196,8 +199,10 @@ int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag, size_t len); int CRYPTO_ocb128_tag(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len); void CRYPTO_ocb128_cleanup(OCB128_CONTEXT *ctx); -#endif /* OPENSSL_NO_OCB */ +# endif /* OPENSSL_NO_OCB */ -#ifdef __cplusplus +# ifdef __cplusplus } +# endif + #endif |