diff options
author | beck <> | 2002-05-15 02:29:21 +0000 |
---|---|---|
committer | beck <> | 2002-05-15 02:29:21 +0000 |
commit | b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9 (patch) | |
tree | fa27cf82a1250b64ed3bf5f4a18c7354d470bbcc /src/lib/libcrypto/md2/md2_dgst.c | |
parent | e471e1ea98d673597b182ea85f29e30c97cd08b5 (diff) | |
download | openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.tar.gz openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.tar.bz2 openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.zip |
OpenSSL 0.9.7 stable 2002 05 08 merge
Diffstat (limited to 'src/lib/libcrypto/md2/md2_dgst.c')
-rw-r--r-- | src/lib/libcrypto/md2/md2_dgst.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/libcrypto/md2/md2_dgst.c b/src/lib/libcrypto/md2/md2_dgst.c index 608baefa8f..e25dd00e02 100644 --- a/src/lib/libcrypto/md2/md2_dgst.c +++ b/src/lib/libcrypto/md2/md2_dgst.c | |||
@@ -115,19 +115,20 @@ const char *MD2_options(void) | |||
115 | return("md2(int)"); | 115 | return("md2(int)"); |
116 | } | 116 | } |
117 | 117 | ||
118 | void MD2_Init(MD2_CTX *c) | 118 | int MD2_Init(MD2_CTX *c) |
119 | { | 119 | { |
120 | c->num=0; | 120 | c->num=0; |
121 | memset(c->state,0,MD2_BLOCK*sizeof(MD2_INT)); | 121 | memset(c->state,0,MD2_BLOCK*sizeof(MD2_INT)); |
122 | memset(c->cksm,0,MD2_BLOCK*sizeof(MD2_INT)); | 122 | memset(c->cksm,0,MD2_BLOCK*sizeof(MD2_INT)); |
123 | memset(c->data,0,MD2_BLOCK); | 123 | memset(c->data,0,MD2_BLOCK); |
124 | return 1; | ||
124 | } | 125 | } |
125 | 126 | ||
126 | void MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len) | 127 | int MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len) |
127 | { | 128 | { |
128 | register UCHAR *p; | 129 | register UCHAR *p; |
129 | 130 | ||
130 | if (len == 0) return; | 131 | if (len == 0) return 1; |
131 | 132 | ||
132 | p=c->data; | 133 | p=c->data; |
133 | if (c->num != 0) | 134 | if (c->num != 0) |
@@ -146,7 +147,7 @@ void MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len) | |||
146 | memcpy(&(p[c->num]),data,(int)len); | 147 | memcpy(&(p[c->num]),data,(int)len); |
147 | /* data+=len; */ | 148 | /* data+=len; */ |
148 | c->num+=(int)len; | 149 | c->num+=(int)len; |
149 | return; | 150 | return 1; |
150 | } | 151 | } |
151 | } | 152 | } |
152 | /* we now can process the input data in blocks of MD2_BLOCK | 153 | /* we now can process the input data in blocks of MD2_BLOCK |
@@ -159,6 +160,7 @@ void MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len) | |||
159 | } | 160 | } |
160 | memcpy(p,data,(int)len); | 161 | memcpy(p,data,(int)len); |
161 | c->num=(int)len; | 162 | c->num=(int)len; |
163 | return 1; | ||
162 | } | 164 | } |
163 | 165 | ||
164 | static void md2_block(MD2_CTX *c, const unsigned char *d) | 166 | static void md2_block(MD2_CTX *c, const unsigned char *d) |
@@ -197,7 +199,7 @@ static void md2_block(MD2_CTX *c, const unsigned char *d) | |||
197 | memset(state,0,48*sizeof(MD2_INT)); | 199 | memset(state,0,48*sizeof(MD2_INT)); |
198 | } | 200 | } |
199 | 201 | ||
200 | void MD2_Final(unsigned char *md, MD2_CTX *c) | 202 | int MD2_Final(unsigned char *md, MD2_CTX *c) |
201 | { | 203 | { |
202 | int i,v; | 204 | int i,v; |
203 | register UCHAR *cp; | 205 | register UCHAR *cp; |
@@ -219,5 +221,6 @@ void MD2_Final(unsigned char *md, MD2_CTX *c) | |||
219 | for (i=0; i<16; i++) | 221 | for (i=0; i<16; i++) |
220 | md[i]=(UCHAR)(p1[i]&0xff); | 222 | md[i]=(UCHAR)(p1[i]&0xff); |
221 | memset((char *)&c,0,sizeof(c)); | 223 | memset((char *)&c,0,sizeof(c)); |
224 | return 1; | ||
222 | } | 225 | } |
223 | 226 | ||