RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 11-Apr-2016 00:12:09
Branch: rpm-5_4 Handle: 2016041022120900
Modified files: (Branch: rpm-5_4)
rpm/rpmio Makefile.am digest.c poptIO.c
Log:
- clang: remove lane and edon-r, clang -fsanitize=address is painful.
Summary:
Revision Changes Path
1.293.2.64 +4 -4 rpm/rpmio/Makefile.am
2.93.2.6 +8 -0 rpm/rpmio/digest.c
1.94.2.19 +4 -0 rpm/rpmio/poptIO.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.293.2.63 -r1.293.2.64 Makefile.am
--- rpm/rpmio/Makefile.am 21 Mar 2016 22:12:25 -0000 1.293.2.63
+++ rpm/rpmio/Makefile.am 10 Apr 2016 22:12:09 -0000 1.293.2.64
@@ -126,8 +126,8 @@
noinst_HEADERS = \
ar.h bcon.h bson.h cpio.h crc.h envvar.h fnmatch.h fts.h glob.h iosm.h \
blake2.h blake2-impl.h blake2-rpm.h blake2-kat.h \
- arirang.h blake.h bmw.h chi.h cubehash.h echo.h edon-r.h fugue.h \
- groestl.h hamsi.h jh.h jsmn.h keccak.h lane.h luffa.h md2.h md6.h \
+ arirang.h blake.h bmw.h chi.h cubehash.h echo.h fugue.h \
+ groestl.h hamsi.h jh.h jsmn.h keccak.h luffa.h md2.h md6.h \
duktape.h mongoc.h radiogatun.h \
salsa10.h salsa20.h shabal.h shavite3.h simd.h skein.h tib3.h tiger.h \
pcrs.h poptIO.h rpmacl.h rpmasn.h rpmaug.h rpmbag.h rpmbc.h rpmbz.h \
@@ -147,8 +147,8 @@
librpmio_la_SOURCES = \
getdate.c \
blake2b.c blake2bp.c blake2s.c blake2sp.c blake2-rpm.c \
- arirang.c blake.c bmw.c chi.c cubehash.c echo.c edon-r.c fugue.c \
- groestl.c hamsi.c jh.c keccak.c lane.c luffa.c md2.c md6.c radiogatun.c\
+ arirang.c blake.c bmw.c chi.c cubehash.c echo.c fugue.c \
+ groestl.c hamsi.c jh.c keccak.c luffa.c md2.c md6.c radiogatun.c\
salsa10.c salsa20.c shabal.c shavite3.c simd.c skein.c tib3.c tiger.c \
rpmgit.c rpmio-stub.c \
rpmjs.cpp rpmjsio.c rpmkeyring.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/digest.c
============================================================================
$ cvs diff -u -r2.93.2.5 -r2.93.2.6 digest.c
--- rpm/rpmio/digest.c 16 Nov 2013 15:48:24 -0000 2.93.2.5
+++ rpm/rpmio/digest.c 10 Apr 2016 22:12:09 -0000 2.93.2.6
@@ -31,7 +31,9 @@
#undef Final
#undef Hash
+#ifdef CLANG_ASAN_COMPILES_SLOWLY
#include "edon-r.h"
+#endif
#include "fugue.h"
@@ -59,7 +61,9 @@
#undef Final
#undef Hash
+#ifdef CLANG_ASAN_COMPILES_SLOWLY
#include "lane.h"
+#endif
#include "luffa.h"
@@ -727,6 +731,7 @@
ctx->Update = (int (*)(void *, const byte *, size_t)) _echo_Update;
ctx->Digest = (int (*)(void *, byte *)) echo_Final;
break;
+#ifdef CLANG_ASAN_COMPILES_SLOWLY
case PGPHASHALGO_EDONR_224: ctx->digestsize = 224/8; goto edonr;
case PGPHASHALGO_EDONR_256: ctx->digestsize = 256/8; goto edonr;
case PGPHASHALGO_EDONR_384: ctx->digestsize = 384/8; goto edonr;
@@ -743,6 +748,7 @@
ctx->Update = (int (*)(void *, const byte *, size_t)) edonr_Update;
ctx->Digest = (int (*)(void *, byte *)) edonr_Final;
break;
+#endif
case PGPHASHALGO_FUGUE_224: ctx->digestsize = 224/8; goto fugue;
case PGPHASHALGO_FUGUE_256: ctx->digestsize = 256/8; goto fugue;
case PGPHASHALGO_FUGUE_384: ctx->digestsize = 384/8; goto fugue;
@@ -820,6 +826,7 @@
ctx->Update = (int (*)(void *, const byte *, size_t)) _keccak_Update;
ctx->Digest = (int (*)(void *, byte *)) keccak_Final;
break;
+#ifdef CLANG_ASAN_COMPILES_SLOWLY
case PGPHASHALGO_LANE_224: ctx->digestsize = 224/8; goto lane;
case PGPHASHALGO_LANE_256: ctx->digestsize = 256/8; goto lane;
case PGPHASHALGO_LANE_384: ctx->digestsize = 384/8; goto lane;
@@ -835,6 +842,7 @@
ctx->Update = (int (*)(void *, const byte *, size_t)) laneUpdate;
ctx->Digest = (int (*)(void *, byte *)) laneDigest;
break;
+#endif
case PGPHASHALGO_LUFFA_224: ctx->digestsize = 224/8; goto luffa;
case PGPHASHALGO_LUFFA_256: ctx->digestsize = 256/8; goto luffa;
case PGPHASHALGO_LUFFA_384: ctx->digestsize = 384/8; goto luffa;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
============================================================================
$ cvs diff -u -r1.94.2.18 -r1.94.2.19 poptIO.c
--- rpm/rpmio/poptIO.c 1 Oct 2014 15:27:33 -0000 1.94.2.18
+++ rpm/rpmio/poptIO.c 10 Apr 2016 22:12:09 -0000 1.94.2.19
@@ -236,6 +236,7 @@
N_("Echo-384 digest"), NULL },
{ "echo-512",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo, PGPHASHALGO_ECHO_512,
N_("Echo-512 digest"), NULL },
+#ifdef CLANG_ASAN_COMPILES_SLOWLY
{ "edonr-224",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo,
PGPHASHALGO_EDONR_224,
N_("EdonR-224 digest"), NULL },
{ "edonr-256",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo,
PGPHASHALGO_EDONR_256,
@@ -244,6 +245,7 @@
N_("EdonR-384 digest"), NULL },
{ "edonr-512",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo,
PGPHASHALGO_EDONR_512,
N_("EdonR-512 digest"), NULL },
+#endif
{ "fugue-224",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo,
PGPHASHALGO_FUGUE_224,
N_("Fugue-224 digest"), NULL },
{ "fugue-256",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo,
PGPHASHALGO_FUGUE_256,
@@ -284,6 +286,7 @@
N_("Keccak-384 digest"), NULL },
{ "keccak-512",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo,
PGPHASHALGO_KECCAK_512,
N_("Keccak-512 digest"), NULL },
+#ifdef CLANG_ASAN_COMPILES_SLOWLY
{ "lane-224",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo, PGPHASHALGO_LANE_224,
N_("Lane-224 digest"), NULL },
{ "lane-256",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo, PGPHASHALGO_LANE_256,
@@ -292,6 +295,7 @@
N_("Lane-384 digest"), NULL },
{ "lane-512",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo, PGPHASHALGO_LANE_512,
N_("Lane-512 digest"), NULL },
+#endif
{ "luffa-224",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo,
PGPHASHALGO_LUFFA_224,
N_("Luffa-224 digest"), NULL },
{ "luffa-256",'\0', POPT_ARG_VAL, &rpmioDigestHashAlgo,
PGPHASHALGO_LUFFA_256,
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
