From 14c854f09f291cb2f22fc24cb5b6ad9aa5e4d6f5 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Wed, 7 Nov 2012 09:15:01 -0800 Subject: [PATCH] remove patches --- packaging/idea.c.gz | Bin 5216 -> 0 bytes ...bgcrypt-1.4.1-rijndael_no_strict_aliasing.patch | 16 -- packaging/libgcrypt-1.5.0-idea.patch | 63 -------- packaging/libgcrypt-1.5.0-idea_codecleanup.patch | 164 --------------------- packaging/libgcrypt-ppc64.patch | 27 ---- packaging/libgcrypt-sparcv9.diff | 23 --- packaging/libgcrypt-strict-aliasing.patch | 15 -- packaging/libgcrypt.spec | 35 ----- 8 files changed, 343 deletions(-) delete mode 100644 packaging/idea.c.gz delete mode 100644 packaging/libgcrypt-1.4.1-rijndael_no_strict_aliasing.patch delete mode 100644 packaging/libgcrypt-1.5.0-idea.patch delete mode 100644 packaging/libgcrypt-1.5.0-idea_codecleanup.patch delete mode 100644 packaging/libgcrypt-ppc64.patch delete mode 100644 packaging/libgcrypt-sparcv9.diff delete mode 100644 packaging/libgcrypt-strict-aliasing.patch diff --git a/packaging/idea.c.gz b/packaging/idea.c.gz deleted file mode 100644 index 576daf7f457cdefa1a63859e055580bffe94e42c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5216 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 - #include - #include -+#include "g10lib.h" -+#include "types.h" -+#include "cipher.h" - - #if !defined(BIG_ENDIAN_HOST) && !defined(LITTLE_ENDIAN_HOST) - /* Try to handle endianness if we didn't get it from config.h */ -@@ -103,9 +106,6 @@ - #endif - #endif - --typedef unsigned short u16; /* Note: Make sure this is a 16 bit type. */ --typedef unsigned long u32; /* Note: Make sure this is a 32 bit type. */ -- - /* end configurable stuff */ - - -@@ -116,8 +116,8 @@ - - /* local stuff */ - --#define FNCCAST_SETKEY(f) ((int(*)(void*, unsigned char*, unsigned int))(f)) --#define FNCCAST_CRYPT(f) ((void(*)(void*, unsigned char*, unsigned char*))(f)) -+#define FNCCAST_SETKEY(f) ((int(*)(void*, byte*, unsigned int))(f)) -+#define FNCCAST_CRYPT(f) ((void(*)(void*, byte*, byte*))(f)) - - #define IDEA_KEYSIZE 16 - #define IDEA_BLOCKSIZE 8 -@@ -131,11 +131,9 @@ - } IDEA_context; - - --static int do_setkey( IDEA_context *c, unsigned char *key, unsigned keylen ); --static void encrypt_block( IDEA_context *bc, unsigned char *outbuf, -- unsigned char *inbuf ); --static void decrypt_block( IDEA_context *bc, unsigned char *outbuf, -- unsigned char *inbuf ); -+static gcry_err_code_t do_setkey( void *data, const byte *key, unsigned keylen ); -+static void encrypt_block( void *data, byte *outbuf, const byte *inbuf ); -+static void decrypt_block( void *data, byte *outbuf, const byte *inbuf ); - static int selftest(int); - - -@@ -170,7 +168,7 @@ - - - static void --expand_key( unsigned char *userkey, u16 *ek ) -+expand_key( const byte *userkey, u16 *ek ) - { - int i,j; - -@@ -233,7 +231,7 @@ - - - static void --cipher( unsigned char *outbuf, unsigned char *inbuf, u16 *key ) -+cipher( byte *outbuf, const byte *inbuf, u16 *key ) - { - u16 x1, x2, x3,x4, s2, s3; - u16 *in, *out; -@@ -309,25 +307,28 @@ - } - - --static int --do_setkey( IDEA_context *c, unsigned char *key, unsigned keylen ) -+static gcry_err_code_t -+do_setkey( void *data, const byte *key, unsigned keylen ) - { -+ IDEA_context *c = (IDEA_context*)data; - assert(keylen == 16); - c->have_dk = 0; - expand_key( key, c->ek ); - invert_key( c->ek, c->dk ); -- return 0; -+ return GPG_ERR_NO_ERROR; - } - - static void --encrypt_block( IDEA_context *c, unsigned char *outbuf, unsigned char *inbuf ) -+encrypt_block( void *data, byte *outbuf, const byte *inbuf ) - { -+ IDEA_context *c = (IDEA_context*)data; - cipher( outbuf, inbuf, c->ek ); - } - - static void --decrypt_block( IDEA_context *c, unsigned char *outbuf, unsigned char *inbuf ) -+decrypt_block( void *data, byte *outbuf, const byte *inbuf ) - { -+ IDEA_context *c = (IDEA_context*)data; - if( !c->have_dk ) { - c->have_dk = 1; - invert_key( c->ek, c->dk ); -@@ -340,9 +341,9 @@ - selftest( int check_decrypt ) - { - static struct { -- unsigned char key[16]; -- unsigned char plain[8]; -- unsigned char cipher[8]; -+ byte key[16]; -+ byte plain[8]; -+ byte cipher[8]; - } test_vectors[] = { - { { 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, - 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08 }, -@@ -390,7 +391,7 @@ - { 0xF5, 0xDB, 0x1A, 0xC4, 0x5E, 0x5E, 0xF9, 0xF9 } } - }; - IDEA_context c; -- unsigned char buffer[8]; -+ byte buffer[8]; - int i; - - for(i=0; i < DIM(test_vectors); i++ ) { -@@ -425,12 +426,12 @@ - const char * - idea_get_info( int algo, size_t *keylen, - size_t *blocksize, size_t *contextsize, -- int (**r_setkey)( void *c, unsigned char *key, -+ int (**r_setkey)( void *c, byte *key, - unsigned keylen ), -- void (**r_encrypt)( void *c, unsigned char *outbuf, -- unsigned char *inbuf ), -- void (**r_decrypt)( void *c, unsigned char *outbuf, -- unsigned char *inbuf ) -+ void (**r_encrypt)( void *c, byte *outbuf, -+ byte *inbuf ), -+ void (**r_decrypt)( void *c, byte *outbuf, -+ byte *inbuf ) - ) - { - static int initialized = 0; -@@ -451,7 +452,22 @@ - return NULL; - } - -+static gcry_err_code_t idea_setkey(void *data, const byte *key, unsigned keylen) -+{ -+ static int initialized = 0; -+ if(!initialized) { -+ initialized = 1; -+ if (selftest(0) || selftest(1)) -+ return GPG_ERR_CIPHER_ALGO; -+ } -+ return do_setkey(data, key, keylen); -+} - -+gcry_cipher_spec_t _gcry_cipher_spec_idea = -+{ -+ "IDEA", NULL, NULL, 8, 128, sizeof (IDEA_context), -+ idea_setkey, encrypt_block, decrypt_block -+}; - - const char * const gnupgext_version = "IDEA ($Revision: 1.11 $)"; - diff --git a/packaging/libgcrypt-ppc64.patch b/packaging/libgcrypt-ppc64.patch deleted file mode 100644 index 8dbecfc..0000000 --- a/packaging/libgcrypt-ppc64.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: libgcrypt-1.4.0/mpi/config.links -=================================================================== ---- libgcrypt-1.4.0.orig/mpi/config.links -+++ libgcrypt-1.4.0/mpi/config.links -@@ -237,11 +237,11 @@ case "${host}" in - ;; - - ppc620-*-* | \ -- powerpc64*-*-*) -+ powerpc64-*-*) - mpi_sflags="-Wa,-mppc" - path="powerpc64" - ;; -- powerpc*-*-linux*) -+ powerpc-*-linux*) - echo '/* configured for powerpc/ELF */' >>./mpi/asm-syntax.h - echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h - cat $srcdir/mpi/powerpc32/syntax.h >>./mpi/asm-syntax.h -@@ -276,7 +276,7 @@ case "${host}" in - mpi_sflags="-Wa,-mppc" - path="powerpc32" - ;; -- powerpc*-*-*) -+ powerpc-*-*) - mpi_sflags="-Wa,-mppc" - path="powerpc32" - ;; diff --git a/packaging/libgcrypt-sparcv9.diff b/packaging/libgcrypt-sparcv9.diff deleted file mode 100644 index 68dabc7..0000000 --- a/packaging/libgcrypt-sparcv9.diff +++ /dev/null @@ -1,23 +0,0 @@ -Avoid link-time error - -../src/.libs/libgcrypt.so: undefined reference to `__udiv_qrnnd' - -by choosing v8-like insns for 32-bit v9 mode too. - ---- - mpi/longlong.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libgcrypt-1.4.4/mpi/longlong.h -=================================================================== ---- libgcrypt-1.4.4.orig/mpi/longlong.h -+++ libgcrypt-1.4.4/mpi/longlong.h -@@ -1133,7 +1133,7 @@ extern USItype __udiv_qrnnd (); - "rJ" ((USItype)(al)), \ - "rI" ((USItype)(bl)) \ - __CLOBBER_CC) --#if defined (__sparc_v8__) -+#if defined (__sparc_v8__) || defined(__sparc_v9__) - /* Don't match immediate range because, 1) it is not often useful, - 2) the 'I' flag thinks of the range as a 13 bit signed interval, - while we want to match a 13 bit interval, sign extended to 32 bits, diff --git a/packaging/libgcrypt-strict-aliasing.patch b/packaging/libgcrypt-strict-aliasing.patch deleted file mode 100644 index ab63659..0000000 --- a/packaging/libgcrypt-strict-aliasing.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: cipher/Makefile.am -=================================================================== ---- cipher/Makefile.am.orig 2009-12-11 16:31:38.000000000 +0100 -+++ cipher/Makefile.am 2010-11-19 10:53:55.818890156 +0100 -@@ -80,3 +80,10 @@ - - tiger.lo: $(srcdir)/tiger.c - `echo $(LTCOMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) ` -+ -+# We need to build ac.c with -fno-strict-aliasing -+ac.o: $(srcdir)/ac.c -+ `echo $(COMPILE) -fno-strict-aliasing -c $(srcdir)/ac.c` -+ -+ac.lo: $(srcdir)/ac.c -+ `echo $(LTCOMPILE) -fno-strict-aliasing -c $(srcdir)/ac.c` diff --git a/packaging/libgcrypt.spec b/packaging/libgcrypt.spec index 4eaa4d4..4847f30 100644 --- a/packaging/libgcrypt.spec +++ b/packaging/libgcrypt.spec @@ -1,21 +1,3 @@ -# -# spec file for package libgcrypt -# -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - Name: libgcrypt Version: 1.5.0 Release: 0 @@ -26,16 +8,8 @@ Url: http://directory.fsf.org/wiki/Libgcrypt Group: Development/Libraries/C and C++ Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf -Source3: idea.c.gz -Patch0: %{name}-ppc64.patch -Patch1: %{name}-strict-aliasing.patch -Patch3: %{name}-1.4.1-rijndael_no_strict_aliasing.patch -Patch4: %{name}-sparcv9.diff -Patch5: %{name}-1.5.0-idea.patch -Patch6: %{name}-1.5.0-idea_codecleanup.patch BuildRequires: libgpg-error-devel >= 1.8 BuildRequires: libtool -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Libgcrypt is a general purpose crypto library based on the code used in @@ -58,13 +32,6 @@ library. %prep %setup -q -gzip -dc < %{SOURCE3} > cipher/idea.c -%patch0 -p1 -%patch1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build # define ciphers to build @@ -88,8 +55,6 @@ make %{?_smp_mflags} %install %make_install -# -rm %{buildroot}%{_libdir}/%{name}.la %post -p /sbin/ldconfig -- 2.7.4