rpm/libgcrypt
SHA256
1
0
Fork 0
forked from pool/libgcrypt
Code Pull Requests Activity

- Refresh patch libgcrypt-1.6.3-aliasing.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=99
This commit is contained in:
Tomáš Chvátal 2017-07-24 08:34:50 +00:00 committed by Git OBS Bridge
parent 6ebe4a1bc9
commit 2658824b7f
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libgcrypt-1.6.3-aliasing.patch
View File

@ -1,8 +1,8 @@
Index: libgcrypt-1.7.2/cipher/bufhelp.h Index: libgcrypt-1.8.0/cipher/bufhelp.h
=================================================================== ===================================================================
--- libgcrypt-1.7.2.orig/cipher/bufhelp.h --- libgcrypt-1.8.0.orig/cipher/bufhelp.h
+++ libgcrypt-1.7.2/cipher/bufhelp.h +++ libgcrypt-1.8.0/cipher/bufhelp.h
@@ -91,7 +91,7 @@ do_bytes: @@ -109,7 +109,7 @@ do_bytes:
for (; len; len--) for (; len; len--)
*dst++ = *src++; *dst++ = *src++;
#endif /*__GNUC__ >= 4 && (__x86_64__ || __i386__)*/ #endif /*__GNUC__ >= 4 && (__x86_64__ || __i386__)*/
@ -11,7 +11,7 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
/* Optimized function for buffer xoring */ /* Optimized function for buffer xoring */
@@ -128,7 +128,7 @@ do_bytes: @@ -146,7 +146,7 @@ do_bytes:
/* Handle tail. */ /* Handle tail. */
for (; len; len--) for (; len; len--)
*dst++ = *src1++ ^ *src2++; *dst++ = *src1++ ^ *src2++;
@ -20,7 +20,7 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
/* Optimized function for in-place buffer xoring. */ /* Optimized function for in-place buffer xoring. */
@@ -200,7 +200,7 @@ do_bytes: @@ -218,7 +218,7 @@ do_bytes:
/* Handle tail. */ /* Handle tail. */
for (; len; len--) for (; len; len--)
*dst1++ = (*dst2++ ^= *src++); *dst1++ = (*dst2++ ^= *src++);
@ -29,7 +29,7 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
/* Optimized function for combined buffer xoring and copying. Used by mainly /* Optimized function for combined buffer xoring and copying. Used by mainly
@@ -253,7 +253,7 @@ do_bytes: @@ -271,7 +271,7 @@ do_bytes:
*dst_xor++ = *srcdst_cpy ^ *src_xor++; *dst_xor++ = *srcdst_cpy ^ *src_xor++;
*srcdst_cpy++ = temp; *srcdst_cpy++ = temp;
} }
@ -38,7 +38,7 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
/* Optimized function for combined buffer xoring and copying. Used by mainly /* Optimized function for combined buffer xoring and copying. Used by mainly
@@ -279,7 +279,7 @@ buf_eq_const(const void *_a, const void @@ -297,7 +297,7 @@ buf_eq_const(const void *_a, const void
diff -= !!(a[i] - b[i]); diff -= !!(a[i] - b[i]);
return !diff; return !diff;
@ -46,8 +46,8 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
+} __attribute__ ((optimize("no-strict-aliasing"))) +} __attribute__ ((optimize("no-strict-aliasing")))
#ifndef BUFHELP_FAST_UNALIGNED_ACCESS #ifndef BUFHELP_UNALIGNED_ACCESS
@@ -291,14 +291,14 @@ static inline u32 buf_get_be32(const voi @@ -309,14 +309,14 @@ static inline u32 buf_get_be32(const voi
const byte *in = _buf; const byte *in = _buf;
return ((u32)in[0] << 24) | ((u32)in[1] << 16) | \ return ((u32)in[0] << 24) | ((u32)in[1] << 16) | \
((u32)in[2] << 8) | (u32)in[3]; ((u32)in[2] << 8) | (u32)in[3];
@ -64,7 +64,7 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
static inline void buf_put_be32(void *_buf, u32 val) static inline void buf_put_be32(void *_buf, u32 val)
{ {
@@ -307,7 +307,7 @@ static inline void buf_put_be32(void *_b @@ -325,7 +325,7 @@ static inline void buf_put_be32(void *_b
out[1] = val >> 16; out[1] = val >> 16;
out[2] = val >> 8; out[2] = val >> 8;
out[3] = val; out[3] = val;
@ -73,7 +73,7 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
static inline void buf_put_le32(void *_buf, u32 val) static inline void buf_put_le32(void *_buf, u32 val)
{ {
@@ -316,7 +316,7 @@ static inline void buf_put_le32(void *_b @@ -334,7 +334,7 @@ static inline void buf_put_le32(void *_b
out[2] = val >> 16; out[2] = val >> 16;
out[1] = val >> 8; out[1] = val >> 8;
out[0] = val; out[0] = val;
@ -82,7 +82,7 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
/* Functions for loading and storing unaligned u64 values of different /* Functions for loading and storing unaligned u64 values of different
@@ -328,7 +328,7 @@ static inline u64 buf_get_be64(const voi @@ -346,7 +346,7 @@ static inline u64 buf_get_be64(const voi
((u64)in[2] << 40) | ((u64)in[3] << 32) | \ ((u64)in[2] << 40) | ((u64)in[3] << 32) | \
((u64)in[4] << 24) | ((u64)in[5] << 16) | \ ((u64)in[4] << 24) | ((u64)in[5] << 16) | \
((u64)in[6] << 8) | (u64)in[7]; ((u64)in[6] << 8) | (u64)in[7];
@ -91,7 +91,7 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
static inline u64 buf_get_le64(const void *_buf) static inline u64 buf_get_le64(const void *_buf)
{ {
@@ -337,7 +337,7 @@ static inline u64 buf_get_le64(const voi @@ -355,7 +355,7 @@ static inline u64 buf_get_le64(const voi
((u64)in[5] << 40) | ((u64)in[4] << 32) | \ ((u64)in[5] << 40) | ((u64)in[4] << 32) | \
((u64)in[3] << 24) | ((u64)in[2] << 16) | \ ((u64)in[3] << 24) | ((u64)in[2] << 16) | \
((u64)in[1] << 8) | (u64)in[0]; ((u64)in[1] << 8) | (u64)in[0];
@ -100,7 +100,7 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
static inline void buf_put_be64(void *_buf, u64 val) static inline void buf_put_be64(void *_buf, u64 val)
{ {
@@ -350,7 +350,7 @@ static inline void buf_put_be64(void *_b @@ -368,7 +368,7 @@ static inline void buf_put_be64(void *_b
out[5] = val >> 16; out[5] = val >> 16;
out[6] = val >> 8; out[6] = val >> 8;
out[7] = val; out[7] = val;
@ -109,16 +109,16 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
static inline void buf_put_le64(void *_buf, u64 val) static inline void buf_put_le64(void *_buf, u64 val)
{ {
@@ -363,7 +363,7 @@ static inline void buf_put_le64(void *_b @@ -381,7 +381,7 @@ static inline void buf_put_le64(void *_b
out[2] = val >> 16; out[2] = val >> 16;
out[1] = val >> 8; out[1] = val >> 8;
out[0] = val; out[0] = val;
-} -}
+} __attribute__ ((optimize("no-strict-aliasing"))) +} __attribute__ ((optimize("no-strict-aliasing")))
#else /*BUFHELP_FAST_UNALIGNED_ACCESS*/ #else /*BUFHELP_UNALIGNED_ACCESS*/
@@ -377,24 +377,24 @@ typedef struct bufhelp_u32_s @@ -395,24 +395,24 @@ typedef struct bufhelp_u32_s
static inline u32 buf_get_be32(const void *_buf) static inline u32 buf_get_be32(const void *_buf)
{ {
return be_bswap32(((const bufhelp_u32_t *)_buf)->a); return be_bswap32(((const bufhelp_u32_t *)_buf)->a);
@ -147,7 +147,7 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
typedef struct bufhelp_u64_s typedef struct bufhelp_u64_s
@@ -407,24 +407,24 @@ typedef struct bufhelp_u64_s @@ -425,24 +425,24 @@ typedef struct bufhelp_u64_s
static inline u64 buf_get_be64(const void *_buf) static inline u64 buf_get_be64(const void *_buf)
{ {
return be_bswap64(((const bufhelp_u64_t *)_buf)->a); return be_bswap64(((const bufhelp_u64_t *)_buf)->a);
@ -175,4 +175,4 @@ Index: libgcrypt-1.7.2/cipher/bufhelp.h
+} __attribute__ ((optimize("no-strict-aliasing"))) +} __attribute__ ((optimize("no-strict-aliasing")))
#endif /*BUFHELP_FAST_UNALIGNED_ACCESS*/ #endif /*BUFHELP_UNALIGNED_ACCESS*/

1
libgcrypt.changes
View File

@ -29,6 +29,7 @@ Fri Jul 21 15:50:14 UTC 2017 - astieger@suse.com
GCRY_MD_BLAKE2S_128 NEW constant. GCRY_MD_BLAKE2S_128 NEW constant.
GCRY_CIPHER_MODE_XTS NEW constant. GCRY_CIPHER_MODE_XTS NEW constant.
gcry_md_info DEPRECATED. gcry_md_info DEPRECATED.
- Refresh patch libgcrypt-1.6.3-aliasing.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 29 09:49:44 UTC 2017 - astieger@suse.com Thu Jun 29 09:49:44 UTC 2017 - astieger@suse.com