diff options
Diffstat (limited to 'lib/libssl/src/ssl/ssl3.h')
| -rw-r--r-- | lib/libssl/src/ssl/ssl3.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/lib/libssl/src/ssl/ssl3.h b/lib/libssl/src/ssl/ssl3.h index b5df1056abc..5f59e18eb45 100644 --- a/lib/libssl/src/ssl/ssl3.h +++ b/lib/libssl/src/ssl/ssl3.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl3.h,v 1.32 2014/12/14 16:07:26 jsing Exp $ */ +/* $OpenBSD: ssl3.h,v 1.33 2014/12/14 21:49:29 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -236,20 +236,7 @@ extern "C" { #define SSL3_RT_HEADER_LENGTH 5 #define SSL3_HM_HEADER_LENGTH 4 -#ifndef SSL3_ALIGN_PAYLOAD - /* Some will argue that this increases memory footprint, but it's - * not actually true. Point is that malloc has to return at least - * 64-bit aligned pointers, meaning that allocating 5 bytes wastes - * 3 bytes in either case. Suggested pre-gaping simply moves these - * wasted bytes from the end of allocated region to its front, - * but makes data payload aligned, which improves performance:-) */ -# define SSL3_ALIGN_PAYLOAD 8 -#else -# if (SSL3_ALIGN_PAYLOAD&(SSL3_ALIGN_PAYLOAD-1))!=0 -# error "insane SSL3_ALIGN_PAYLOAD" -# undef SSL3_ALIGN_PAYLOAD -# endif -#endif +#define SSL3_ALIGN_PAYLOAD 8 /* This is the maximum MAC (digest) size used by the SSL library. * Currently maximum of 20 is used by SHA1, but we reserve for |