5 files changed, 77 insertions, 5 deletions
diff --git a/ext/digest/sha1/depend b/ext/digest/sha1/depend
index 31a5da06cf..a159f456d3 100644
--- a/ext/digest/sha1/depend
+++ b/ext/digest/sha1/depend
@@ -5,3 +5,4 @@ sha1hl.o: sha1hl.c sha1.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
 sha1init.o: sha1init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
   $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
   sha1.h $(srcdir)/../defs.h
+sha1ossl.o: sha1ossl.h  $(srcdir)/../defs.h
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index 45e374e369..d5b7e06d9c 100644
--- a/ext/digest/sha1/extconf.rb
+++ b/ext/digest/sha1/extconf.rb
@@ -5,11 +5,17 @@ require "mkmf"
 
 $CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
-$objs = [
-  "sha1.#{$OBJEXT}",
-  "sha1hl.#{$OBJEXT}",
-  "sha1init.#{$OBJEXT}",
-]
+$objs = [ "sha1init.#{$OBJEXT}" ]
+
+dir_config("openssl")
+
+if !with_config("bundled-sha1") &&
+    have_library("crypto") && have_header("openssl/sha.h")
+  $objs << "sha1ossl.#{$OBJEXT}"
+  $libs << " -lcrypto"
+else
+  $objs << "sha1.#{$OBJEXT}" << "sha1hl.#{$OBJEXT}"
+end
 
 have_header("sys/cdefs.h")
 
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
index 70bc4f9f52..426afb7cd0 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -2,7 +2,11 @@
 /* $Id$ */
 
 #include "digest.h"
+#if defined(HAVE_OPENSSL_SHA_H)
+#include "sha1ossl.h"
+#else
 #include "sha1.h"
+#endif
 
 static algo_t sha1 = {
     SHA1_DIGEST_LENGTH,
diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c
new file mode 100644
index 0000000000..b125128f82
--- /dev/null
+++ b/ext/digest/sha1/sha1ossl.c
@@ -0,0 +1,45 @@
+/* $Id$ */
+
+#include "sha1ossl.h"
+#include "defs.h"
+#include <assert.h>
+#include <stdlib.h>
+
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(cond)	assert(cond)
+#endif
+
+char *
+SHA1_End(SHA1_CTX *ctx, char *buf)
+{
+    int i;
+    char *p = buf;
+    uint8_t digest[20];
+    static const char hex[]="0123456789abcdef";
+
+    _DIAGASSERT(ctx != NULL);
+    /* buf may be NULL */
+
+    if (p == NULL && (p = malloc(41)) == NULL)
+	return 0;
+
+    SHA1_Final(digest,ctx);
+    for (i = 0; i < 20; i++) {
+	p[i + i] = hex[((uint32_t)digest[i]) >> 4];
+	p[i + i + 1] = hex[digest[i] & 0x0f];
+    }
+    p[i + i] = '\0';
+    return(p);
+}
+
+int SHA1_Equal(SHA1_CTX* pctx1, SHA1_CTX* pctx2) {
+	return pctx1->num == pctx2->num
+	  && pctx1->h0 == pctx2->h0
+	  && pctx1->h1 == pctx2->h1
+	  && pctx1->h2 == pctx2->h2
+	  && pctx1->h3 == pctx2->h3
+	  && pctx1->h4 == pctx2->h4
+	  && pctx1->Nl == pctx2->Nl
+	  && pctx1->Nh == pctx2->Nh
+	  && memcmp(pctx1->data, pctx2->data, sizeof(pctx1->data)) == 0;
+}
diff --git a/ext/digest/sha1/sha1ossl.h b/ext/digest/sha1/sha1ossl.h
new file mode 100644
index 0000000000..e8d7e74baf
--- /dev/null
+++ b/ext/digest/sha1/sha1ossl.h
@@ -0,0 +1,16 @@
+/* $Id$ */
+
+#ifndef SHA1OSSL_H_INCLUDED
+#define SHA1OSSL_H_INCLUDED
+
+#include <openssl/sha.h>
+
+#define SHA1_CTX	SHA_CTX
+
+#define SHA1_BLOCK_LENGTH	SHA_BLOCK_LENGTH
+#define SHA1_DIGEST_LENGTH	SHA_DIGEST_LENGTH
+
+char *SHA1_End(SHA1_CTX *ctx, char *buf);
+int SHA1_Equal(SHA1_CTX *pctx1, SHA1_CTX *pctx2);
+
+#endif