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
|
--- generic/sha1.c 2009-06-18 00:54:44.000000000 -0400
+++ generic/sha1.c 2009-07-12 23:39:47.000000000 -0400
@@ -28,5 +28,6 @@
*/
-#include "loadman.h"
+#include "transformInt.h"
+#include <openssl/sha.h>
/*
@@ -39,5 +40,5 @@
#ifndef OTP
-#define DIGEST_SIZE (SHA_DIGEST_LENGTH)
+#define DIGEST_SIZE (20)
#else
#define DIGEST_SIZE (8)
@@ -49,9 +50,7 @@
*/
-static void MDsha1_Start _ANSI_ARGS_ ((VOID* context));
-static void MDsha1_Update _ANSI_ARGS_ ((VOID* context, unsigned int character));
-static void MDsha1_UpdateBuf _ANSI_ARGS_ ((VOID* context, unsigned char* buffer, int bufLen));
-static void MDsha1_Final _ANSI_ARGS_ ((VOID* context, VOID* digest));
-static int MDsha1_Check _ANSI_ARGS_ ((Tcl_Interp* interp));
+#ifdef OTP
+static void MDsha1_OTP_Final _ANSI_ARGS_ ((VOID* context, VOID* digest));
+#endif
/*
@@ -67,9 +66,13 @@
sizeof (CTX_TYPE),
DIGEST_SIZE,
- MDsha1_Start,
- MDsha1_Update,
- MDsha1_UpdateBuf,
- MDsha1_Final,
- MDsha1_Check
+ (Trf_MDStart *)SHA1_Init,
+ NULL,
+ (Trf_MDUpdateBuf *)SHA1_Update,
+#ifdef OTP
+ MDsha1_OTP_Final,
+#else
+ (Trf_MDFinal *)SHA1_Final,
+#endif
+ NULL,
};
@@ -103,91 +106,9 @@
}
+#ifdef OTP
/*
*------------------------------------------------------*
*
- * MDsha1_Start --
- *
- * ------------------------------------------------*
- * Initialize the internal state of the message
- * digest generator.
- * ------------------------------------------------*
- *
- * Sideeffects:
- * As of the called procedure.
- *
- * Result:
- * None.
- *
- *------------------------------------------------------*
- */
-
-static void
-MDsha1_Start (context)
-VOID* context;
-{
- sha1f.init ((SHA_CTX*) context);
-}
-
-/*
- *------------------------------------------------------*
- *
- * MDsha1_Update --
- *
- * ------------------------------------------------*
- * Update the internal state of the message digest
- * generator for a single character.
- * ------------------------------------------------*
- *
- * Sideeffects:
- * As of the called procedure.
- *
- * Result:
- * None.
- *
- *------------------------------------------------------*
- */
-
-static void
-MDsha1_Update (context, character)
-VOID* context;
-unsigned int character;
-{
- unsigned char buf = character;
-
- sha1f.update ((SHA_CTX*) context, &buf, 1);
-}
-
-/*
- *------------------------------------------------------*
- *
- * MDsha1_UpdateBuf --
- *
- * ------------------------------------------------*
- * Update the internal state of the message digest
- * generator for a character buffer.
- * ------------------------------------------------*
- *
- * Sideeffects:
- * As of the called procedure.
- *
- * Result:
- * None.
- *
- *------------------------------------------------------*
- */
-
-static void
-MDsha1_UpdateBuf (context, buffer, bufLen)
-VOID* context;
-unsigned char* buffer;
-int bufLen;
-{
- sha1f.update ((SHA_CTX*) context, (unsigned char*) buffer, bufLen);
-}
-
-/*
- *------------------------------------------------------*
- *
- * MDsha1_Final --
+ * MDsha1_OTP_Final --
*
* ------------------------------------------------*
@@ -206,14 +127,11 @@
static void
-MDsha1_Final (context, digest)
+MDsha1_OTP_Final (digest, context)
VOID* context;
VOID* digest;
{
-#ifndef OTP
- sha1f.final ((unsigned char*) digest, (SHA_CTX*) context);
-#else
unsigned int result[SHA_DIGEST_LENGTH / sizeof (char)];
- sha1f.final ((unsigned char*) result, (SHA_CTX*) context);
+ SHA1_Final ((unsigned char*) result, (SHA_CTX*) context);
result[0] ^= result[2];
@@ -223,31 +141,4 @@
Trf_FlipRegisterLong ((VOID*) result, DIGEST_SIZE);
memcpy ((VOID *) digest, (VOID *) result, DIGEST_SIZE);
-#endif
-}
-
-/*
- *------------------------------------------------------*
- *
- * MDsha1_Check --
- *
- * ------------------------------------------------*
- * Do global one-time initializations of the message
- * digest generator.
- * ------------------------------------------------*
- *
- * Sideeffects:
- * Loads the shared library containing the
- * SHA1 functionality
- *
- * Result:
- * A standard Tcl error code.
- *
- *------------------------------------------------------*
- */
-
-static int
-MDsha1_Check (interp)
-Tcl_Interp* interp;
-{
- return TrfLoadSHA1 (interp);
}
+#endif
|
