diff options
| author | Matt Caswell <matt@openssl.org> | 2014-12-07 23:53:22 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-12-08 10:29:03 +0000 |
| commit | 3feb63054a981528e77a4a8f58a822c8dff4f4c5 (patch) | |
| tree | d74b62347b5bac22531d2c4d64f6cb53277e0f82 /crypto/modes/modes_lcl.h | |
| parent | e4bbee963348414a8f5e75dc7d23c3e30c72a860 (diff) | |
| download | openssl-3feb63054a981528e77a4a8f58a822c8dff4f4c5.zip openssl-3feb63054a981528e77a4a8f58a822c8dff4f4c5.tar.gz openssl-3feb63054a981528e77a4a8f58a822c8dff4f4c5.tar.bz2 | |
Added OPENSSL_NO_OCB guards
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/modes/modes_lcl.h')
| -rw-r--r-- | crypto/modes/modes_lcl.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/modes/modes_lcl.h b/crypto/modes/modes_lcl.h index 1813825..1d83155 100644 --- a/crypto/modes/modes_lcl.h +++ b/crypto/modes/modes_lcl.h @@ -136,20 +136,22 @@ struct ccm128_context { void *key; }; +#ifndef OPENSSL_NO_OCB + #ifdef STRICT_ALIGNMENT typedef struct { unsigned char a[16]; } OCB_BLOCK; # define ocb_block16_xor(in1,in2,out) \ ocb_block_xor((in1)->a,(in2)->a,16,(out)->a) -#else +#else /* STRICT_ALIGNMENT */ typedef struct { u64 a; u64 b; } OCB_BLOCK; # define ocb_block16_xor(in1,in2,out) \ (out)->a=(in1)->a^(in2)->a; (out)->b=(in1)->b^(in2)->b; -#endif +#endif /* STRICT_ALIGNMENT */ struct ocb128_context { /* Need both encrypt and decrypt key schedules for decryption */ @@ -175,3 +177,4 @@ struct ocb128_context { OCB_BLOCK checksum; }; +#endif /* OPENSSL_NO_OCB */ |