diff --git a/conf/distro/include/maintainers-meta-security.inc b/conf/distro/include/maintainers-meta-security.inc index 8bde7bd..3aac2cb 100644 --- a/conf/distro/include/maintainers-meta-security.inc +++ b/conf/distro/include/maintainers-meta-security.inc @@ -37,7 +37,6 @@ RECIPE_MAINTAINER:pn-keyutils = "Scott Murray " RECIPE_MAINTAINER:pn-libaes-siv = "Scott Murray " RECIPE_MAINTAINER:pn-libgssglue = "Scott Murray " RECIPE_MAINTAINER:pn-libhtp = "Scott Murray " -RECIPE_MAINTAINER:pn-libmhash = "Scott Murray " RECIPE_MAINTAINER:pn-lib-perl = "Scott Murray " RECIPE_MAINTAINER:pn-libseccomp = "Scott Murray " RECIPE_MAINTAINER:pn-libwhisker2-perl = "Scott Murray " diff --git a/recipes-core/packagegroup/packagegroup-core-security.bb b/recipes-core/packagegroup/packagegroup-core-security.bb index d3d3d7e..101bc6d 100644 --- a/recipes-core/packagegroup/packagegroup-core-security.bb +++ b/recipes-core/packagegroup/packagegroup-core-security.bb @@ -39,7 +39,6 @@ RDEPENDS:packagegroup-security-utils = "\ glome \ keyutils \ libgssglue \ - libmhash \ nmap \ pinentry \ softhsm \ diff --git a/recipes-security/libmhash/files/Makefile.test b/recipes-security/libmhash/files/Makefile.test deleted file mode 100644 index 2e32626..0000000 --- a/recipes-security/libmhash/files/Makefile.test +++ /dev/null @@ -1,13 +0,0 @@ -# -# Makefile for compiling mhash tests -# - -ALL = mhash - -all: $(ALL) - -mhash: mhash.c - $(CC) $(CFLAGS) $(LDFLAGS) -o mhash mhash.c -lmhash - -clean: - rm -f *.debug $(ALL) diff --git a/recipes-security/libmhash/files/mhash.c b/recipes-security/libmhash/files/mhash.c deleted file mode 100644 index 5d123cc..0000000 --- a/recipes-security/libmhash/files/mhash.c +++ /dev/null @@ -1,32 +0,0 @@ -#include -#include - -int main() -{ - - char password[] = "Jefe"; - int keylen = 4; - char data[] = "what do ya want for nothing?"; - int datalen = 28; - MHASH td; - unsigned char mac[16]; - int j; - - td = mhash_hmac_init(MHASH_MD5, password, keylen, mhash_get_hash_pblock(MHASH_MD5)); - - mhash(td, data, datalen); - mhash_hmac_deinit(td, mac); - -/* - * The output should be 0x750c783e6ab0b503eaa86e310a5db738 - * according to RFC 2104. - */ - - printf("0x"); - for (j = 0; j < mhash_get_block_size(MHASH_MD5); j++) { - printf("%.2x", mac[j]); - } - printf("\n"); - - exit(0); -} diff --git a/recipes-security/libmhash/files/run-ptest b/recipes-security/libmhash/files/run-ptest deleted file mode 100644 index 2b0b94a..0000000 --- a/recipes-security/libmhash/files/run-ptest +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -OUTPUT=$($(dirname $0)/mhash) -MHASH_MD5="0x750c783e6ab0b503eaa86e310a5db738" - -if [ x"$OUTPUT" = x"$MHASH_MD5" ]; then - echo "PASS: mhash ptest" - exit 0 -else - echo "FAIL: mhash ptest" - exit 1 -fi diff --git a/recipes-security/libmhash/libmhash_0.9.9.9.bb b/recipes-security/libmhash/libmhash_0.9.9.9.bb deleted file mode 100644 index 7c7fb11..0000000 --- a/recipes-security/libmhash/libmhash_0.9.9.9.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Library of hashing algorithms." -DESCRIPTION = "\ - Mhash is a free (under GNU Lesser GPL) library \ - which provides a uniform interface to a large number of hash \ - algorithms. These algorithms can be used to compute checksums, \ - message digests, and other signatures. \ - " -HOMEPAGE = "http://mhash.sourceforge.net/" - -LICENSE = "LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" - -S = "${UNPACKDIR}/mhash-${PV}" - -SECTION = "libs" - -SRC_URI = "${SOURCEFORGE_MIRROR}/mhash/mhash-${PV}.tar.bz2 \ - file://Makefile.test \ - file://mhash.c \ - file://run-ptest \ - " - -SRC_URI[md5sum] = "f91c74f9ccab2b574a98be5bc31eb280" -SRC_URI[sha256sum] = "56521c52a9033779154432d0ae47ad7198914785265e1f570cee21ab248dfef0" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mhash/files/" - -inherit autotools-brokensep ptest multilib_header - -CFLAGS += "-std=gnu17" - -do_install:append() { - oe_multilib_header mutils/mhash_config.h -} - -do_compile_ptest() { - if [ ! -d ${S}/demo ]; then mkdir ${S}/demo; fi - cp ${UNPACKDIR}/Makefile.test ${S}/demo/Makefile - cp ${UNPACKDIR}/mhash.c ${S}/demo/ - make -C ${S}/demo CFLAGS="${CFLAGS} -I${S}/include/" LDFLAGS="${LDFLAGS} -L${S}/lib/.libs" -} - -do_install_ptest() { - install -m 0755 ${S}/demo/mhash ${D}${PTEST_PATH} -} - -BBCLASSEXTEND = "native"