diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 93723b50b639d8dc717bc1bf463fd46e1b321239 (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libcrypto/md2/md2_dgst.c | |
| parent | 65e72ac55a6405783db7a12d7e35a7561d46005b (diff) | |
| download | openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.tar.gz openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.tar.bz2 openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/md2/md2_dgst.c')
| -rw-r--r-- | src/lib/libcrypto/md2/md2_dgst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/md2/md2_dgst.c b/src/lib/libcrypto/md2/md2_dgst.c index c57b3da288..bf89def73e 100644 --- a/src/lib/libcrypto/md2/md2_dgst.c +++ b/src/lib/libcrypto/md2/md2_dgst.c | |||
| @@ -116,7 +116,7 @@ const char *MD2_options(void) | |||
| 116 | return("md2(int)"); | 116 | return("md2(int)"); |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | int MD2_Init(MD2_CTX *c) | 119 | fips_md_init(MD2) |
| 120 | { | 120 | { |
| 121 | c->num=0; | 121 | c->num=0; |
| 122 | memset(c->state,0,sizeof c->state); | 122 | memset(c->state,0,sizeof c->state); |