1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
|
--- generic/sha.c 2009-07-12 21:34:41.000000000 -0400
+++ generic/sha.c 2009-07-12 23:11:26.000000000 -0400
@@ -29,12 +29,5 @@
#include "transformInt.h"
-#include "sha/sha.h"
-
-#ifdef WORDS_BIGENDIAN
-#undef LITTLE_ENDIAN
-#else
-#undef LITTLE_ENDIAN
-#define LITTLE_ENDIAN
-#endif
+#include <openssl/sha.h>
/*
@@ -46,30 +39,8 @@
*/
-#define DIGEST_SIZE (SHA_DIGESTSIZE)
-#define CTX_TYPE sha_trf_info
+#define DIGEST_SIZE (20)
+#define CTX_TYPE SHA_CTX
#define CHUNK_SIZE 256
-/* We cannot use SHA_INFO directly as context cause 'sha_update' handles
- * a chunk smaller then CHUNK_SIZE bytes correct if and only if it is
- * the last chunk. This forces us to buffer the incoming bytes till a chunk
- * is complete before doing an update.
- */
-
-typedef struct _sha_trf_info {
- SHA_INFO s;
- unsigned short count;
- unsigned char buf [CHUNK_SIZE]; /* SHA block */
-} sha_trf_info;
-
-
-/*
- * Declarations of internal procedures.
- */
-
-static void MDsha_Start _ANSI_ARGS_ ((VOID* context));
-static void MDsha_Update _ANSI_ARGS_ ((VOID* context, unsigned int character));
-static void MDsha_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen));
-static void MDsha_Final _ANSI_ARGS_ ((VOID* context, VOID* digest));
-
/*
* Generator definition.
@@ -80,8 +51,8 @@
sizeof (CTX_TYPE),
DIGEST_SIZE,
- MDsha_Start,
- MDsha_Update,
- MDsha_UpdateBuf,
- MDsha_Final,
+ (Trf_MDStart *)SHA_Init,
+ NULL,
+ (Trf_MDUpdateBuf *)SHA_Update,
+ (Trf_MDFinal *)SHA_Final,
NULL
};
@@ -111,181 +82,2 @@
return Trf_RegisterMessageDigest (interp, &mdDescription);
}
-
-/*
- *------------------------------------------------------*
- *
- * MDsha_Start --
- *
- * ------------------------------------------------*
- * Initialize the internal state of the message
- * digest generator.
- * ------------------------------------------------*
- *
- * Sideeffects:
- * As of the called procedure.
- *
- * Result:
- * None.
- *
- *------------------------------------------------------*
- */
-
-static void
-MDsha_Start (context)
-VOID* context;
-{
- sha_trf_info* s = (sha_trf_info*) context;
-
- memset (s, '\0', sizeof (sha_trf_info));
- sha_init (&s->s);
-}
-
-/*
- *------------------------------------------------------*
- *
- * MDsha_Update --
- *
- * ------------------------------------------------*
- * Update the internal state of the message digest
- * generator for a single character.
- * ------------------------------------------------*
- *
- * Sideeffects:
- * As of the called procedure.
- *
- * Result:
- * None.
- *
- *------------------------------------------------------*
- */
-
-static void
-MDsha_Update (context, character)
-VOID* context;
-unsigned int character;
-{
- sha_trf_info* s = (sha_trf_info*) context;
-
- s->buf [s->count] = character;
- s->count ++;
-
- if (s->count == CHUNK_SIZE) {
- sha_update (&s->s, s->buf, s->count);
- s->count = 0;
- }
-}
-
-/*
- *------------------------------------------------------*
- *
- * MDsha_UpdateBuf --
- *
- * ------------------------------------------------*
- * Update the internal state of the message digest
- * generator for a character buffer.
- * ------------------------------------------------*
- *
- * Sideeffects:
- * As of the called procedure.
- *
- * Result:
- * None.
- *
- *------------------------------------------------------*
- */
-
-static void
-MDsha_UpdateBuf (context, buffer, bufLen)
-VOID* context;
-unsigned char* buffer;
-int bufLen;
-{
- sha_trf_info* s = (sha_trf_info*) context;
-
- if ((s->count + bufLen) < CHUNK_SIZE) {
- /*
- * Not enough for full chunk. Remember incoming
- * data and wait for another call containing more data.
- */
-
- memcpy ((VOID*) (s->buf + s->count), (VOID*) buffer, bufLen);
- s->count += bufLen;
- } else {
- /*
- * Complete chunk with incoming data, update digest,
- * then use all chunks contained in the buffer. Remember
- * an incomplete chunk and wait for further calls.
- */
-
- int k = CHUNK_SIZE - s->count;
-
- if (k < CHUNK_SIZE) {
- memcpy ((VOID*) (s->buf + s->count), (VOID*) buffer, k);
-
- sha_update (&s->s, s->buf, CHUNK_SIZE);
-
- buffer += k;
- bufLen -= k;
- } /* k == CHUNK_SIZE => internal buffer was empty, so skip it entirely */
-
- while (bufLen > CHUNK_SIZE) {
- sha_update (&s->s, buffer, CHUNK_SIZE);
-
- buffer += CHUNK_SIZE;
- bufLen -= CHUNK_SIZE;
- }
-
- s->count = bufLen;
- if (bufLen > 0)
- memcpy ((VOID*) s->buf, (VOID*) buffer, bufLen);
- }
-}
-
-/*
- *------------------------------------------------------*
- *
- * MDsha_Final --
- *
- * ------------------------------------------------*
- * Generate the digest from the internal state of
- * the message digest generator.
- * ------------------------------------------------*
- *
- * Sideeffects:
- * As of the called procedure.
- *
- * Result:
- * None.
- *
- *------------------------------------------------------*
- */
-
-static void
-MDsha_Final (context, digest)
-VOID* context;
-VOID* digest;
-{
- sha_trf_info* s = (sha_trf_info*) context;
-
- if (s->count > 0) {
- sha_update (&s->s, s->buf, s->count);
- }
-
- sha_final (&s->s);
-
-#ifndef WORDS_BIGENDIAN
- Trf_FlipRegisterLong (s->s.digest, SHA_DIGESTSIZE);
-#endif
-
- memcpy (digest, s->s.digest, SHA_DIGESTSIZE);
-}
-
-/*
- * External code from here on.
- *
- * To make smaller object code, but run a little slower, don't use UNROLL_LOOPS.
- * To use NIST's modified SHA of 7/11/94, define USE_MODIFIED_SHA
- */
-
-#define UNROLL_LOOPS
-#include "sha/sha.c"
|
