diff options
Diffstat (limited to 'src/lib/libcrypto/des')
-rw-r--r-- | src/lib/libcrypto/des/des_locl.h | 7 | ||||
-rw-r--r-- | src/lib/libcrypto/des/spr.h | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/libcrypto/des/des_locl.h b/src/lib/libcrypto/des/des_locl.h index 38ac68a6e6..34a7609873 100644 --- a/src/lib/libcrypto/des/des_locl.h +++ b/src/lib/libcrypto/des/des_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: des_locl.h,v 1.18 2014/10/28 07:35:58 jsg Exp $ */ | 1 | /* $OpenBSD: des_locl.h,v 1.19 2016/12/21 15:49:29 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -70,6 +70,8 @@ | |||
70 | 70 | ||
71 | #include <openssl/des.h> | 71 | #include <openssl/des.h> |
72 | 72 | ||
73 | __BEGIN_HIDDEN_DECLS | ||
74 | |||
73 | #define ITERATIONS 16 | 75 | #define ITERATIONS 16 |
74 | #define HALF_ITERATIONS 8 | 76 | #define HALF_ITERATIONS 8 |
75 | 77 | ||
@@ -389,4 +391,7 @@ void fcrypt_body(DES_LONG *out,DES_key_schedule *ks, | |||
389 | #ifdef OPENSSL_SMALL_FOOTPRINT | 391 | #ifdef OPENSSL_SMALL_FOOTPRINT |
390 | #undef DES_UNROLL | 392 | #undef DES_UNROLL |
391 | #endif | 393 | #endif |
394 | |||
395 | __END_HIDDEN_DECLS | ||
396 | |||
392 | #endif | 397 | #endif |
diff --git a/src/lib/libcrypto/des/spr.h b/src/lib/libcrypto/des/spr.h index eec6beb9f7..5e717065fb 100644 --- a/src/lib/libcrypto/des/spr.h +++ b/src/lib/libcrypto/des/spr.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: spr.h,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: spr.h,v 1.6 2016/12/21 15:49:29 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -56,6 +56,8 @@ | |||
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | 58 | ||
59 | __BEGIN_HIDDEN_DECLS | ||
60 | |||
59 | const DES_LONG DES_SPtrans[8][64]={ | 61 | const DES_LONG DES_SPtrans[8][64]={ |
60 | { | 62 | { |
61 | /* nibble 0 */ | 63 | /* nibble 0 */ |
@@ -202,3 +204,5 @@ const DES_LONG DES_SPtrans[8][64]={ | |||
202 | 0x00000080L, 0x20820000L, 0x00820080L, 0x00000000L, | 204 | 0x00000080L, 0x20820000L, 0x00820080L, 0x00000000L, |
203 | 0x20000000L, 0x20800080L, 0x00020000L, 0x00820080L, | 205 | 0x20000000L, 0x20800080L, 0x00020000L, 0x00820080L, |
204 | }}; | 206 | }}; |
207 | |||
208 | __END_HIDDEN_DECLS | ||