really fix race condition

[openssl.git] / crypto / sha / sha1_one.c

diff --git a/crypto/sha/sha1_one.c b/crypto/sha/sha1_one.c
index cf381fa39386a5db80691a8c3b297cc0635206e9..e6a24888ed5949675cf49da35ae0b7309281042a 100644 (file)
--- a/crypto/sha/sha1_one.c
+++ b/crypto/sha/sha1_one.c
@@ -1,5 +1,5 @@
 /* crypto/sha/sha1_one.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -57,13 +57,11 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
-#include "sha.h"
+#include <string.h>
+#include <openssl/sha.h>
 
-unsigned char *SHA1(d, n, md)
-unsigned char *d;
-unsigned long n;
-unsigned char *md;
+#ifndef OPENSSL_NO_SHA1
+unsigned char *SHA1(const unsigned char *d, unsigned long n, unsigned char *md)
        {
        SHA_CTX c;
        static unsigned char m[SHA_DIGEST_LENGTH];
@@ -75,3 +73,4 @@ unsigned char *md;
        memset(&c,0,sizeof(c));
        return(md);
        }
+#endif