diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 942650cdef05a877200cb7aff3a075935a5fd0cd (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libcrypto/mdc2/mdc2.h | |
| parent | 37f091539f73e1650c83acd0c78677ef48c209a6 (diff) | |
| download | openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.gz openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.bz2 openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/mdc2/mdc2.h')
| -rw-r--r-- | src/lib/libcrypto/mdc2/mdc2.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/libcrypto/mdc2/mdc2.h b/src/lib/libcrypto/mdc2/mdc2.h index 72778a5212..f3e8e579d2 100644 --- a/src/lib/libcrypto/mdc2/mdc2.h +++ b/src/lib/libcrypto/mdc2/mdc2.h | |||
| @@ -81,6 +81,9 @@ typedef struct mdc2_ctx_st | |||
| 81 | } MDC2_CTX; | 81 | } MDC2_CTX; |
| 82 | 82 | ||
| 83 | 83 | ||
| 84 | #ifdef OPENSSL_FIPS | ||
| 85 | int private_MDC2_Init(MDC2_CTX *c); | ||
| 86 | #endif | ||
| 84 | int MDC2_Init(MDC2_CTX *c); | 87 | int MDC2_Init(MDC2_CTX *c); |
| 85 | int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len); | 88 | int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len); |
| 86 | int MDC2_Final(unsigned char *md, MDC2_CTX *c); | 89 | int MDC2_Final(unsigned char *md, MDC2_CTX *c); |