diff options
-rw-r--r-- | src/lib/libcrypto/des/des_local.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/lib/libcrypto/des/des_local.h b/src/lib/libcrypto/des/des_local.h index f081adedb2..c37128473b 100644 --- a/src/lib/libcrypto/des/des_local.h +++ b/src/lib/libcrypto/des/des_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: des_local.h,v 1.2 2023/07/08 07:11:07 beck Exp $ */ | 1 | /* $OpenBSD: des_local.h,v 1.3 2024/05/24 19:21:58 tb 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 | * |
@@ -73,11 +73,6 @@ | |||
73 | __BEGIN_HIDDEN_DECLS | 73 | __BEGIN_HIDDEN_DECLS |
74 | 74 | ||
75 | #define ITERATIONS 16 | 75 | #define ITERATIONS 16 |
76 | #define HALF_ITERATIONS 8 | ||
77 | |||
78 | /* used in des_read and des_write */ | ||
79 | #define MAXWRITE (1024*16) | ||
80 | #define BSIZE (MAXWRITE+4) | ||
81 | 76 | ||
82 | #define c2l(c,l) (l =((DES_LONG)(*((c)++))) , \ | 77 | #define c2l(c,l) (l =((DES_LONG)(*((c)++))) , \ |
83 | l|=((DES_LONG)(*((c)++)))<< 8L, \ | 78 | l|=((DES_LONG)(*((c)++)))<< 8L, \ |
@@ -105,20 +100,6 @@ __BEGIN_HIDDEN_DECLS | |||
105 | *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ | 100 | *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ |
106 | *((c)++)=(unsigned char)(((l)>>24L)&0xff)) | 101 | *((c)++)=(unsigned char)(((l)>>24L)&0xff)) |
107 | 102 | ||
108 | /* replacements for htonl and ntohl since I have no idea what to do | ||
109 | * when faced with machines with 8 byte longs. */ | ||
110 | #define HDRSIZE 4 | ||
111 | |||
112 | #define n2l(c,l) (l =((DES_LONG)(*((c)++)))<<24L, \ | ||
113 | l|=((DES_LONG)(*((c)++)))<<16L, \ | ||
114 | l|=((DES_LONG)(*((c)++)))<< 8L, \ | ||
115 | l|=((DES_LONG)(*((c)++)))) | ||
116 | |||
117 | #define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \ | ||
118 | *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ | ||
119 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ | ||
120 | *((c)++)=(unsigned char)(((l) )&0xff)) | ||
121 | |||
122 | /* NOTE - c is not incremented as per l2c */ | 103 | /* NOTE - c is not incremented as per l2c */ |
123 | #define l2cn(l1,l2,c,n) { \ | 104 | #define l2cn(l1,l2,c,n) { \ |
124 | c+=n; \ | 105 | c+=n; \ |