summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-02-24 09:19:38 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-02-24 18:13:12 +0100
commit608fdeab33bdd98548b6f92becd1ebc25cfa2f76 (patch)
treedc4433b3454234d172b40d586d31aca8e488a37c
parent4454b1067d97ecba920b02c27414638730b239a3 (diff)
downloadptxdist-608fdeab33bdd98548b6f92becd1ebc25cfa2f76.tar.gz
ptxdist-608fdeab33bdd98548b6f92becd1ebc25cfa2f76.tar.xz
libmd: remove obsolete package
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/libmd-0.3.1/0001-fix-building-on-x86_64.patch24
-rw-r--r--patches/libmd-0.3.1/0002-fix-incorrect-memcpy-memset-size-argument.patch44
-rw-r--r--patches/libmd-0.3.1/series5
-rw-r--r--rules/libmd.in39
-rw-r--r--rules/libmd.make71
5 files changed, 0 insertions, 183 deletions
diff --git a/patches/libmd-0.3.1/0001-fix-building-on-x86_64.patch b/patches/libmd-0.3.1/0001-fix-building-on-x86_64.patch
deleted file mode 100644
index 8f5f22759..000000000
--- a/patches/libmd-0.3.1/0001-fix-building-on-x86_64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 5 Aug 2014 07:16:41 +0200
-Subject: [PATCH] fix building on x86_64
-
-for x86_64: unsigned int != size_t
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- include/rmd160.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/rmd160.h b/include/rmd160.h
-index 0dd08677f539..7ecb62a6b732 100644
---- a/include/rmd160.h
-+++ b/include/rmd160.h
-@@ -31,7 +31,7 @@ typedef struct RMD160Context {
-
- __BEGIN_DECLS
- void RMD160Init(RMD160_CTX *);
--void RMD160Update(RMD160_CTX *, const unsigned char *, unsigned int);
-+void RMD160Update(RMD160_CTX *, const unsigned char *, size_t);
- void RMD160Final(unsigned char [RMD160_HASHBYTES], RMD160_CTX *);
- char * RMD160End(RMD160_CTX *, char *);
- char * RMD160File(const char *, char *);
diff --git a/patches/libmd-0.3.1/0002-fix-incorrect-memcpy-memset-size-argument.patch b/patches/libmd-0.3.1/0002-fix-incorrect-memcpy-memset-size-argument.patch
deleted file mode 100644
index 2400d0f96..000000000
--- a/patches/libmd-0.3.1/0002-fix-incorrect-memcpy-memset-size-argument.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 5 May 2015 23:40:01 +0200
-Subject: [PATCH] fix incorrect memcpy()/memset() size argument
-
-Arrays as function arguments are realy pointers so sizeof(digest) ==
-sizeof(unsigned char*) != 20
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/rmd160.c | 2 +-
- src/sha.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/rmd160.c b/src/rmd160.c
-index ec047fe33b28..87d9674aab0b 100644
---- a/src/rmd160.c
-+++ b/src/rmd160.c
-@@ -444,5 +444,5 @@ RMD160Final (unsigned char digest[20], RMD160_CTX * ctx)
- digest[i * 4 + 3] = (u_int8_t) (t >> 24);
- }
-
-- memset (ctx, 0, sizeof (ctx)); /* In case it's sensitive */
-+ memset (ctx, 0, sizeof (*ctx)); /* In case it's sensitive */
- }
-diff --git a/src/sha.c b/src/sha.c
-index 779ace1de031..d24c5537d8ac 100644
---- a/src/sha.c
-+++ b/src/sha.c
-@@ -344,7 +344,7 @@ SHAFinal (unsigned char digest[20], SHA_CTX * ctx)
- #endif
- SHATransform (ctx);
-
-- memcpy (digest, ctx->iv, sizeof (digest));
-+ memcpy (digest, ctx->iv, 20);
- for (i = 0; i < SHA_HASHWORDS; i++)
- {
- t = ctx->iv[i];
-@@ -354,5 +354,5 @@ SHAFinal (unsigned char digest[20], SHA_CTX * ctx)
- digest[i * 4 + 3] = (u_int8_t) t;
- }
-
-- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
-+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
- }
diff --git a/patches/libmd-0.3.1/series b/patches/libmd-0.3.1/series
deleted file mode 100644
index 7d89fa959..000000000
--- a/patches/libmd-0.3.1/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-fix-building-on-x86_64.patch
-0002-fix-incorrect-memcpy-memset-size-argument.patch
-# c1c9261075f56369b9e67a084f309c60 - git-ptx-patches magic
diff --git a/rules/libmd.in b/rules/libmd.in
deleted file mode 100644
index e82f52116..000000000
--- a/rules/libmd.in
+++ /dev/null
@@ -1,39 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=system_libraries
-menuconfig LIBMD
- tristate
- prompt "libmd "
- help
- Libmd is a cryptographic message digest library. It implements these
- message digest algorithms:
- MD2 (RFC 1319 - B. Kaliski)
- MD4 (RFC 1186 - R. Rivest)
- MD5 (RFC 1321 - R. Rivest)
- SHA-1 (FIPS PUB 180 and 180.1 - NIST)
- RIPEMD-160 (http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html)
- It could be used by the upcoming new Xorg server if you don't want
- the openssl package on your target. If there is already openssl
- present, the Xorg server can use the SHA-1 from the openssl library
- instead.
-
- STAGING: remove in ptxdist-2017.10.0
- Upstream long dead and no longer needed.
-
-if LIBMD
-
-config LIBMD_STATIC
- bool
- prompt "build static only"
- help
- Build a static only version of this library. This makes sense if only
- one program will use this library on the target and it makes more
- sense if a CPU with low register count (like x86) is in use.
-
-config LIBMD_DEBUG
- bool
- prompt "enable debug support"
- help
- Build the library with debug support.
-
-endif
diff --git a/rules/libmd.make b/rules/libmd.make
deleted file mode 100644
index c6377ccf2..000000000
--- a/rules/libmd.make
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2009 by Juergen Beisert
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_LIBMD) += libmd
-
-#
-# Paths and names
-#
-LIBMD_VERSION := 0.3.1
-LIBMD_MD5 := 0bc578ca17d9534418bf24d7602163a2
-LIBMD := libmd-$(LIBMD_VERSION)
-LIBMD_SUFFIX := tar.gz
-LIBMD_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(LIBMD).$(LIBMD_SUFFIX)
-LIBMD_SOURCE := $(SRCDIR)/$(LIBMD).$(LIBMD_SUFFIX)
-LIBMD_DIR := $(BUILDDIR)/$(LIBMD)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-LIBMD_PATH := PATH=$(CROSS_PATH)
-LIBMD_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-LIBMD_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-ifdef PTXCONF_LIBMD_STATIC
-LIBMD_AUTOCONF += --disable-shared
-endif
-
-ifdef PTXCONF_LIBMD_DEBUG
-LIBMD_AUTOCONF += --enable-debug
-endif
-
-#ifdef PTXCONF_LIBMD_DOC
-#LIBMD_AUTOCONF += --enable-doc
-#endif
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/libmd.targetinstall:
- @$(call targetinfo)
-
-ifndef PTXCONF_LIBMD_STATIC
- @$(call install_init, libmd)
- @$(call install_fixup, libmd,PRIORITY,optional)
- @$(call install_fixup, libmd,SECTION,base)
- @$(call install_fixup, libmd,AUTHOR,"Juergen Beisert <jbe@pengutronix.de>")
- @$(call install_fixup, libmd,DESCRIPTION,missing)
-
- @$(call install_lib, libmd, 0, 0, 0644, libmd)
-
- @$(call install_finish, libmd)
-endif
- @$(call touch)
-
-# vim: syntax=make