diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/sha/sha.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/lib/libcrypto/sha/sha.h b/src/lib/libcrypto/sha/sha.h index d890175159..87fdf8d186 100644 --- a/src/lib/libcrypto/sha/sha.h +++ b/src/lib/libcrypto/sha/sha.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sha.h,v 1.20 2014/10/20 13:06:54 bcook Exp $ */ | 1 | /* $OpenBSD: sha.h,v 1.21 2015/09/13 21:09:56 doug Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -70,7 +70,7 @@ | |||
70 | extern "C" { | 70 | extern "C" { |
71 | #endif | 71 | #endif |
72 | 72 | ||
73 | #if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1)) | 73 | #if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA1) |
74 | #error SHA is disabled. | 74 | #error SHA is disabled. |
75 | #endif | 75 | #endif |
76 | 76 | ||
@@ -97,15 +97,6 @@ typedef struct SHAstate_st | |||
97 | unsigned int num; | 97 | unsigned int num; |
98 | } SHA_CTX; | 98 | } SHA_CTX; |
99 | 99 | ||
100 | #ifndef OPENSSL_NO_SHA0 | ||
101 | int SHA_Init(SHA_CTX *c); | ||
102 | int SHA_Update(SHA_CTX *c, const void *data, size_t len) | ||
103 | __attribute__ ((__bounded__(__buffer__,2,3))); | ||
104 | int SHA_Final(unsigned char *md, SHA_CTX *c); | ||
105 | unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md) | ||
106 | __attribute__ ((__bounded__(__buffer__,1,2))); | ||
107 | void SHA_Transform(SHA_CTX *c, const unsigned char *data); | ||
108 | #endif | ||
109 | #ifndef OPENSSL_NO_SHA1 | 100 | #ifndef OPENSSL_NO_SHA1 |
110 | int SHA1_Init(SHA_CTX *c); | 101 | int SHA1_Init(SHA_CTX *c); |
111 | int SHA1_Update(SHA_CTX *c, const void *data, size_t len) | 102 | int SHA1_Update(SHA_CTX *c, const void *data, size_t len) |