Revert "Render: Use built-in SHA1 library"

This reverts commit d3bd31fddff7894f89ba80a3cdddff49aff08db8.

X.org should not be providing a custom SHA1 implementation.

1 files changed, 28 insertions, 1 deletions

diff --git a/render/glyph.c b/render/glyph.c
index 949e02340..849e65fce 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -26,7 +26,13 @@
 #include <dix-config.h>
 #endif
 
-#include "sha1.h"
+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
+# include <sha1.h>
+#else /* Use OpenSSL's libcrypto */
+# include <stddef.h>  /* buggy openssl/sha.h wants size_t */
+# include <openssl/sha.h>
+#endif
+
 #include "misc.h"
 #include "scrnintstr.h"
 #include "os.h"
@@ -192,12 +198,33 @@ HashGlyph (xGlyphInfo    *gi,
 	   unsigned long size,
 	   unsigned char sha1[20])
 {
+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
     SHA1_CTX ctx;
 
     SHA1Init (&ctx);
     SHA1Update (&ctx, gi, sizeof (xGlyphInfo));
     SHA1Update (&ctx, bits, size);
     SHA1Final (sha1, &ctx);
+#else /* Use OpenSSL's libcrypto */
+    SHA_CTX ctx;
+    int success;
+
+    success = SHA1_Init (&ctx);
+    if (! success)
+	return BadAlloc;
+
+    success = SHA1_Update (&ctx, gi, sizeof (xGlyphInfo));
+    if (! success)
+	return BadAlloc;
+
+    success = SHA1_Update (&ctx, bits, size);
+    if (! success)
+	return BadAlloc;
+
+    success = SHA1_Final (sha1, &ctx);
+    if (! success)
+	return BadAlloc;
+#endif
 
     return Success;
 }