[simutrans] 03/09: Drop 0110-sha1-replacement.diff.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository simutrans.

commit 80878d1c02bd08beab9858dcecd3b7e8e0bbf4b1
Author: Markus Koschany <apo at debian.org>
Date:   Thu Nov 10 23:20:53 2016 +0100

    Drop 0110-sha1-replacement.diff.
    
    We don't need this patch because the original sha1 implementation from Paul E.
    Jones is free software.
    
    See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730758 for a
    clarification.
---
 debian/patches/0110-sha1-replacement.diff | 95 -------------------------------
 debian/patches/series                     |  1 -
 2 files changed, 96 deletions(-)

diff --git a/debian/patches/0110-sha1-replacement.diff b/debian/patches/0110-sha1-replacement.diff
deleted file mode 100644
index 1bf4ffd..0000000
--- a/debian/patches/0110-sha1-replacement.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Ansgar Burchardt <ansgar at debian.org>
-Date: Wed, 16 Feb 2011 21:28:04 +0100
-Subject: Provide replacement for non-free SHA-1 implementation
-Index: trunk/utils/sha1.cc
-===================================================================
---- /dev/null
-+++ trunk/utils/sha1.cc
-@@ -0,0 +1,54 @@
-+/*
-+ * sha1.cc
-+ *
-+ * (C) 2011, Ansgar Burchardt <ansgar at debian.org>
-+ *
-+ * This file may be used under the Artistic license.
-+ */
-+
-+#include "sha1.h"
-+#include "../simtypes.h"
-+#include <stdexcept>
-+
-+SHA1::SHA1()
-+{
-+  EVP_MD_CTX_init(&m_md_ctx);
-+  Reset();
-+}
-+
-+SHA1::~SHA1()
-+{
-+  EVP_MD_CTX_cleanup(&m_md_ctx);
-+}
-+
-+void SHA1::Reset()
-+{
-+  if (!EVP_DigestInit_ex(&m_md_ctx, EVP_sha1(), 0))
-+    throw std::runtime_error("EVP_DigestInit_ex failed.");
-+}
-+
-+bool SHA1::Result(unsigned char *md_value)
-+{
-+  bool ret = EVP_DigestFinal_ex(&m_md_ctx, md_value, 0);
-+
-+#ifndef SIM_BIG_ENDIAN
-+  uint32 *hash = reinterpret_cast<uint32*>(md_value);
-+  for (size_t o = 0; o < 5; ++o) {
-+    hash[o] = hash[o] << 16 | hash[o] >> 16;
-+    hash[o] = (hash[o] << 8 & 0xff00ff00) | (hash[o] >> 8 & 0x00ff00ff);
-+  }
-+#endif
-+
-+  return ret;
-+}
-+
-+void SHA1::Input(const char *mess, unsigned int length)
-+{
-+  if (!EVP_DigestUpdate(&m_md_ctx, mess, length))
-+    throw std::runtime_error("EVP_DigestUpdate failed.");
-+}
-+
-+void SHA1::Input(char mess)
-+{
-+  Input(&mess, 1);
-+}
-Index: trunk/utils/sha1.h
-===================================================================
---- /dev/null
-+++ trunk/utils/sha1.h
-@@ -0,0 +1,28 @@
-+/*
-+ * sha1.h
-+ *
-+ * (C) 2011, Ansgar Burchardt <ansgar at debian.org>
-+ *
-+ * This file may be used under the Artistic license.
-+ */
-+
-+#ifndef _SHA1_H_
-+#define _SHA1_H_
-+
-+#include "../simtypes.h"
-+#include <openssl/evp.h>
-+
-+class SHA1
-+{
-+  public:
-+    SHA1();
-+    ~SHA1();
-+    void Reset();
-+    bool Result(unsigned char *md_value);
-+    void Input(const char *mess, unsigned int length);
-+    void Input(char mess);
-+  private:
-+    EVP_MD_CTX m_md_ctx;
-+};
-+
-+#endif
diff --git a/debian/patches/series b/debian/patches/series
index edee4e8..c1c43c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,5 @@
 0100-path_for_game-data.patch
 0500-config.diff
 0505-link-less-libraries.diff
-0110-sha1-replacement.diff
 #0510-missing_uncommon_mk.patch
 reproducible-build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/simutrans.git