diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/hmac/hmac.h | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/hmac/hmac.h')
| -rw-r--r-- | src/lib/libcrypto/hmac/hmac.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/libcrypto/hmac/hmac.h b/src/lib/libcrypto/hmac/hmac.h index 294ab3b36a..c6489c04c8 100644 --- a/src/lib/libcrypto/hmac/hmac.h +++ b/src/lib/libcrypto/hmac/hmac.h | |||
| @@ -64,7 +64,11 @@ | |||
| 64 | 64 | ||
| 65 | #include <openssl/evp.h> | 65 | #include <openssl/evp.h> |
| 66 | 66 | ||
| 67 | #ifdef OPENSSL_FIPS | ||
| 68 | #define HMAC_MAX_MD_CBLOCK 128 | ||
| 69 | #else | ||
| 67 | #define HMAC_MAX_MD_CBLOCK 64 | 70 | #define HMAC_MAX_MD_CBLOCK 64 |
| 71 | #endif | ||
| 68 | 72 | ||
| 69 | #ifdef __cplusplus | 73 | #ifdef __cplusplus |
| 70 | extern "C" { | 74 | extern "C" { |