Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2016-06-30 18:57:39 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2016-06-30 18:57:39 +0300
commitc60b61a290960c1411d4da34d7f9265a43fd831b (patch)
treea9b68ca1d34e2c2399adc243f9b8274f718d1694 /src/core/ngx_sha1.h
parentfb6c764921dff3322b33ed2f5169b4c23f84bd9c (diff)
Internal md5 and sha1 implementations are now always used.
This reduces the number of moving parts in ABI compatibility checks. Additionally, it also allows to use OpenSSL in FIPS mode while still using md5 for non-security tasks.
Diffstat (limited to 'src/core/ngx_sha1.h')
-rw-r--r--src/core/ngx_sha1.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/core/ngx_sha1.h b/src/core/ngx_sha1.h
index 7fe4c9887..4a98f7183 100644
--- a/src/core/ngx_sha1.h
+++ b/src/core/ngx_sha1.h
@@ -13,26 +13,6 @@
#include <ngx_core.h>
-#if (NGX_HAVE_SHA1)
-
-#if (NGX_HAVE_OPENSSL_SHA1_H)
-#include <openssl/sha.h>
-#else
-#include <sha.h>
-#endif
-
-
-typedef SHA_CTX ngx_sha1_t;
-
-
-#define ngx_sha1_init SHA1_Init
-#define ngx_sha1_update SHA1_Update
-#define ngx_sha1_final SHA1_Final
-
-
-#else /* !NGX_HAVE_SHA1 */
-
-
typedef struct {
uint64_t bytes;
uint32_t a, b, c, d, e, f;
@@ -45,6 +25,4 @@ void ngx_sha1_update(ngx_sha1_t *ctx, const void *data, size_t size);
void ngx_sha1_final(u_char result[20], ngx_sha1_t *ctx);
-#endif
-
#endif /* _NGX_SHA1_H_INCLUDED_ */