summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/md2
diff options
context:
space:
mode:
authormarkus <>2003-05-11 21:36:59 +0000
committermarkus <>2003-05-11 21:36:59 +0000
commit9cea7b85baecb1a02a3ea617de73d9693a9792eb (patch)
treeb0ca83a03e35572831c5818cd2011868d462a5d1 /src/lib/libcrypto/md2
parentf8f1d7fabf136ce9810602509c477d2c42bf6d1c (diff)
downloadopenbsd-9cea7b85baecb1a02a3ea617de73d9693a9792eb.tar.gz
openbsd-9cea7b85baecb1a02a3ea617de73d9693a9792eb.tar.bz2
openbsd-9cea7b85baecb1a02a3ea617de73d9693a9792eb.zip
import 0.9.7b (without idea and rc5)
Diffstat (limited to 'src/lib/libcrypto/md2')
-rw-r--r--src/lib/libcrypto/md2/md2_dgst.c9
-rw-r--r--src/lib/libcrypto/md2/md2_one.c2
-rw-r--r--src/lib/libcrypto/md2/md2test.c5
3 files changed, 9 insertions, 7 deletions
diff --git a/src/lib/libcrypto/md2/md2_dgst.c b/src/lib/libcrypto/md2/md2_dgst.c
index e25dd00e02..ecb64f0ec4 100644
--- a/src/lib/libcrypto/md2/md2_dgst.c
+++ b/src/lib/libcrypto/md2/md2_dgst.c
@@ -61,6 +61,7 @@
61#include <string.h> 61#include <string.h>
62#include <openssl/md2.h> 62#include <openssl/md2.h>
63#include <openssl/opensslv.h> 63#include <openssl/opensslv.h>
64#include <openssl/crypto.h>
64 65
65const char *MD2_version="MD2" OPENSSL_VERSION_PTEXT; 66const char *MD2_version="MD2" OPENSSL_VERSION_PTEXT;
66 67
@@ -118,9 +119,9 @@ const char *MD2_options(void)
118int MD2_Init(MD2_CTX *c) 119int MD2_Init(MD2_CTX *c)
119 { 120 {
120 c->num=0; 121 c->num=0;
121 memset(c->state,0,MD2_BLOCK*sizeof(MD2_INT)); 122 memset(c->state,0,sizeof c->state);
122 memset(c->cksm,0,MD2_BLOCK*sizeof(MD2_INT)); 123 memset(c->cksm,0,sizeof c->cksm);
123 memset(c->data,0,MD2_BLOCK); 124 memset(c->data,0,sizeof c->data);
124 return 1; 125 return 1;
125 } 126 }
126 127
@@ -196,7 +197,7 @@ static void md2_block(MD2_CTX *c, const unsigned char *d)
196 t=(t+i)&0xff; 197 t=(t+i)&0xff;
197 } 198 }
198 memcpy(sp1,state,16*sizeof(MD2_INT)); 199 memcpy(sp1,state,16*sizeof(MD2_INT));
199 memset(state,0,48*sizeof(MD2_INT)); 200 OPENSSL_cleanse(state,48*sizeof(MD2_INT));
200 } 201 }
201 202
202int MD2_Final(unsigned char *md, MD2_CTX *c) 203int MD2_Final(unsigned char *md, MD2_CTX *c)
diff --git a/src/lib/libcrypto/md2/md2_one.c b/src/lib/libcrypto/md2/md2_one.c
index b12c37ce4d..835160ef56 100644
--- a/src/lib/libcrypto/md2/md2_one.c
+++ b/src/lib/libcrypto/md2/md2_one.c
@@ -88,6 +88,6 @@ unsigned char *MD2(const unsigned char *d, unsigned long n, unsigned char *md)
88 } 88 }
89#endif 89#endif
90 MD2_Final(md,&c); 90 MD2_Final(md,&c);
91 memset(&c,0,sizeof(c)); /* Security consideration */ 91 OPENSSL_cleanse(&c,sizeof(c)); /* Security consideration */
92 return(md); 92 return(md);
93 } 93 }
diff --git a/src/lib/libcrypto/md2/md2test.c b/src/lib/libcrypto/md2/md2test.c
index 7d3664faf5..901d0a7d8e 100644
--- a/src/lib/libcrypto/md2/md2test.c
+++ b/src/lib/libcrypto/md2/md2test.c
@@ -61,6 +61,8 @@
61#include <string.h> 61#include <string.h>
62#include <openssl/md2.h> 62#include <openssl/md2.h>
63 63
64#include "../e_os.h"
65
64#ifdef OPENSSL_NO_MD2 66#ifdef OPENSSL_NO_MD2
65int main(int argc, char *argv[]) 67int main(int argc, char *argv[])
66{ 68{
@@ -122,8 +124,7 @@ int main(int argc, char *argv[])
122 R++; 124 R++;
123 P++; 125 P++;
124 } 126 }
125 exit(err); 127 EXIT(err);
126 return(0);
127 } 128 }
128 129
129static char *pt(unsigned char *md) 130static char *pt(unsigned char *md)