From simit.ghane at lge.com Tue Jun 11 03:52:28 2024 From: simit.ghane at lge.com (simit.ghane) Date: Tue, 11 Jun 2024 07:22:28 +0530 Subject: [PATCH] random:cipher: handle substitution in sed command Message-ID: <20240611015228.1886303-1-simit.ghane@lge.com> It was there earlier and accidentally removed from Makefile.am of cipher and random Signed-off-by: simit.ghane --- cipher/Makefile.am | 2 +- random/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cipher/Makefile.am b/cipher/Makefile.am index a914ed2ba4..956ca345e3 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -168,7 +168,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c if ENABLE_O_FLAG_MUNGING -o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' +o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g' else o_flag_munging = cat endif diff --git a/random/Makefile.am b/random/Makefile.am index c7100ef8b8..a42e430649 100644 --- a/random/Makefile.am +++ b/random/Makefile.am @@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h # The rndjent module needs to be compiled without optimization. */ if ENABLE_O_FLAG_MUNGING -o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g' +o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g' else o_flag_munging = cat endif -- 2.34.1 From jussi.kivilinna at iki.fi Sat Jun 22 16:40:48 2024 From: jussi.kivilinna at iki.fi (Jussi Kivilinna) Date: Sat, 22 Jun 2024 17:40:48 +0300 Subject: [PATCH 2/4] chacha20-ppc: silence GCC cast alignment warning In-Reply-To: <20240622144051.349320-1-jussi.kivilinna@iki.fi> References: <20240622144051.349320-1-jussi.kivilinna@iki.fi> Message-ID: <20240622144051.349320-2-jussi.kivilinna@iki.fi> * cipher/chacha20-ppc.c (vec_load_le, vec_store_le): Cast pointers through void pointer type. -- Signed-off-by: Jussi Kivilinna --- cipher/chacha20-ppc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cipher/chacha20-ppc.c b/cipher/chacha20-ppc.c index 994b6a01..fe991b08 100644 --- a/cipher/chacha20-ppc.c +++ b/cipher/chacha20-ppc.c @@ -65,7 +65,7 @@ vec_rol_elems(vector4x_u32 v, unsigned int idx) static ASM_FUNC_ATTR_INLINE vector4x_u32 -vec_load_le(unsigned long offset, const unsigned char *ptr) +vec_load_le(unsigned long offset, const void *ptr) { vector4x_u32 vec; vec = vec_vsx_ld (offset, (const u32 *)ptr); @@ -78,7 +78,7 @@ vec_load_le(unsigned long offset, const unsigned char *ptr) static ASM_FUNC_ATTR_INLINE void -vec_store_le(vector4x_u32 vec, unsigned long offset, unsigned char *ptr) +vec_store_le(vector4x_u32 vec, unsigned long offset, void *ptr) { #ifdef WORDS_BIGENDIAN vec = (vector4x_u32)vec_perm((vector16x_u8)vec, (vector16x_u8)vec, -- 2.43.0 From jussi.kivilinna at iki.fi Sat Jun 22 16:40:50 2024 From: jussi.kivilinna at iki.fi (Jussi Kivilinna) Date: Sat, 22 Jun 2024 17:40:50 +0300 Subject: [PATCH 4/4] mpi/generic: use longlong.h for carry handling In-Reply-To: <20240622144051.349320-1-jussi.kivilinna@iki.fi> References: <20240622144051.349320-1-jussi.kivilinna@iki.fi> Message-ID: <20240622144051.349320-4-jussi.kivilinna@iki.fi> * mpi/generic/mpih-add1.c (_gcry_mpih_add_n): Use add_ssaaaa for carry handling. * mpi/generic/mpih-mul1.c (_gcry_mpih_mul_1): Likewise. * mpi/generic/mpih-mul2.c (_gcry_mpih_addmul_1): Likewise. * mpi/generic/mpih-mul3.c (_gcry_mpih_submul_1): Use add_ssaaaa and sub_ddmmss for carry handling. * mpi/generic/mpih-sub1.c (_gcry_mpih_sub_n): Likewise. -- Signed-off-by: Jussi Kivilinna --- mpi/generic/mpih-add1.c | 15 ++++++++------- mpi/generic/mpih-mul1.c | 7 +++---- mpi/generic/mpih-mul2.c | 13 +++++-------- mpi/generic/mpih-mul3.c | 14 ++++++-------- mpi/generic/mpih-sub1.c | 16 +++++++++------- 5 files changed, 31 insertions(+), 34 deletions(-) diff --git a/mpi/generic/mpih-add1.c b/mpi/generic/mpih-add1.c index 0a51f06c..4c95609b 100644 --- a/mpi/generic/mpih-add1.c +++ b/mpi/generic/mpih-add1.c @@ -1,5 +1,5 @@ /* mpihelp-add_1.c - MPI helper functions - * Copyright (C) 1994, 1996, 1997, 1998, + * Copyright (C) 1994, 1996, 1997, 1998, * 2000, 2002 Free Software Foundation, Inc. * * This file is part of Libgcrypt. @@ -48,16 +48,17 @@ _gcry_mpih_add_n (mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, res_ptr -= j; cy = 0; - do + do { y = s2_ptr[j]; x = s1_ptr[j]; - y += cy; /* add previous carry to one addend */ - cy = y < cy; /* get out carry from that addition */ - y += x; /* add other addend */ - cy += y < x; /* get out carry from that add, combine */ + /* Add previous carry to one addend and get out carry from + * that addition. */ + add_ssaaaa (cy, y, 0, y, 0, cy); + /* Add other addend and get out carry from that add, combine. */ + add_ssaaaa (cy, y, cy, y, 0, x); res_ptr[j] = y; - } + } while ( ++j ); return cy; diff --git a/mpi/generic/mpih-mul1.c b/mpi/generic/mpih-mul1.c index e88be914..accae1dc 100644 --- a/mpi/generic/mpih-mul1.c +++ b/mpi/generic/mpih-mul1.c @@ -48,13 +48,12 @@ _gcry_mpih_mul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, res_ptr -= j; cy_limb = 0; - do + do { umul_ppmm( prod_high, prod_low, s1_ptr[j], s2_limb ); - prod_low += cy_limb; - cy_limb = (prod_low < cy_limb?1:0) + prod_high; + add_ssaaaa( cy_limb, prod_low, prod_high, prod_low, 0, cy_limb ); res_ptr[j] = prod_low; - } + } while( ++j ); return cy_limb; diff --git a/mpi/generic/mpih-mul2.c b/mpi/generic/mpih-mul2.c index bc925e01..931438dd 100644 --- a/mpi/generic/mpih-mul2.c +++ b/mpi/generic/mpih-mul2.c @@ -48,20 +48,17 @@ _gcry_mpih_addmul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, s1_ptr -= j; cy_limb = 0; - do + do { umul_ppmm( prod_high, prod_low, s1_ptr[j], s2_limb ); - - prod_low += cy_limb; - cy_limb = (prod_low < cy_limb?1:0) + prod_high; + add_ssaaaa( cy_limb, prod_low, prod_high, prod_low, 0, cy_limb ); x = res_ptr[j]; - prod_low = x + prod_low; - cy_limb += prod_low < x?1:0; + add_ssaaaa( cy_limb, prod_low, cy_limb, prod_low, 0, x ); res_ptr[j] = prod_low; - } + } while ( ++j ); - + return cy_limb; } diff --git a/mpi/generic/mpih-mul3.c b/mpi/generic/mpih-mul3.c index 4ecd2c6b..7372c845 100644 --- a/mpi/generic/mpih-mul3.c +++ b/mpi/generic/mpih-mul3.c @@ -36,7 +36,7 @@ mpi_limb_t _gcry_mpih_submul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, mpi_limb_t s2_limb) { - mpi_limb_t cy_limb; + mpi_limb_t cy_limb, borrow; mpi_size_t j; mpi_limb_t prod_high, prod_low; mpi_limb_t x; @@ -48,18 +48,16 @@ _gcry_mpih_submul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, s1_ptr -= j; cy_limb = 0; - do + do { umul_ppmm( prod_high, prod_low, s1_ptr[j], s2_limb); - - prod_low += cy_limb; - cy_limb = (prod_low < cy_limb?1:0) + prod_high; + add_ssaaaa( cy_limb, prod_low, prod_high, prod_low, 0, cy_limb ); x = res_ptr[j]; - prod_low = x - prod_low; - cy_limb += prod_low > x?1:0; + sub_ddmmss( borrow, prod_low, 0, x, 0, prod_low ); + cy_limb -= borrow; res_ptr[j] = prod_low; - } + } while( ++j ); return cy_limb; diff --git a/mpi/generic/mpih-sub1.c b/mpi/generic/mpih-sub1.c index b8eff0db..bb51487c 100644 --- a/mpi/generic/mpih-sub1.c +++ b/mpi/generic/mpih-sub1.c @@ -35,7 +35,7 @@ mpi_limb_t _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_ptr_t s2_ptr, mpi_size_t size) { - mpi_limb_t x, y, cy; + mpi_limb_t x, y, cy, borrow; mpi_size_t j; /* The loop counter and index J goes from -SIZE to -1. This way @@ -48,16 +48,18 @@ _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, res_ptr -= j; cy = 0; - do + do { y = s2_ptr[j]; x = s1_ptr[j]; - y += cy; /* add previous carry to subtrahend */ - cy = y < cy; /* get out carry from that addition */ - y = x - y; /* main subtract */ - cy += y > x; /* get out carry from the subtract, combine */ + /* Add previous carry to subtrahend and get out carry from + * that addition. */ + add_ssaaaa (cy, y, 0, y, 0, cy); + /* Main subtract and get out carry from the subtract, combine. */ + sub_ddmmss( borrow, y, 0, x, 0, y ); + cy -= borrow; res_ptr[j] = y; - } + } while( ++j ); return cy; -- 2.43.0 From jussi.kivilinna at iki.fi Sat Jun 22 16:40:47 2024 From: jussi.kivilinna at iki.fi (Jussi Kivilinna) Date: Sat, 22 Jun 2024 17:40:47 +0300 Subject: [PATCH 1/4] rijndael-p10le: silence incorrect GCC cast alignment warning Message-ID: <20240622144051.349320-1-jussi.kivilinna@iki.fi> * cipher/rijndael-p10le.c (_gcry_aes_p10le_gcm_crypt): Cast context to RIJNDAEL_context type through void pointer. -- Signed-off-by: Jussi Kivilinna --- cipher/rijndael-p10le.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cipher/rijndael-p10le.c b/cipher/rijndael-p10le.c index b16ebe1b..65d804f9 100644 --- a/cipher/rijndael-p10le.c +++ b/cipher/rijndael-p10le.c @@ -44,7 +44,7 @@ size_t _gcry_aes_p10le_gcm_crypt(gcry_cipher_hd_t c, void *outbuf_arg, const void *inbuf_arg, size_t nblocks, int encrypt) { - RIJNDAEL_context *ctx = (RIJNDAEL_context *) &c->context.c; + RIJNDAEL_context *ctx = (void *)&c->context.c; unsigned char *rk = (unsigned char *) ctx->u1.keyschedule; unsigned char *gcm_table = (unsigned char *) c->u_mode.gcm.gcm_table; unsigned char *iv = c->u_ctr.ctr; -- 2.43.0 From jussi.kivilinna at iki.fi Sat Jun 22 16:40:49 2024 From: jussi.kivilinna at iki.fi (Jussi Kivilinna) Date: Sat, 22 Jun 2024 17:40:49 +0300 Subject: [PATCH 3/4] chacha20-ppc: fix implicit conversion between vector types warnings In-Reply-To: <20240622144051.349320-1-jussi.kivilinna@iki.fi> References: <20240622144051.349320-1-jussi.kivilinna@iki.fi> Message-ID: <20240622144051.349320-3-jussi.kivilinna@iki.fi> * cipher/chacha20-ppc.c (chacha20_ppc_blocks4) (chacha20_ppc_blocks4, chacha20_poly1305_ppc_blocks4): Explicitly convert return values from vec_cmplt. -- Commit solves new warning type: warning: Implicit conversion between vector types (''__vector __bool unsigned int' (vector of 4 'unsigned int' values)' and ''vector4x_u32' (vector of 4 'unsigned int' values)') is deprecated. In the future, the behavior implied by '-fno-lax-vector-conversions' will be the default. [-Wdeprecate-lax-vec-conv-all] Signed-off-by: Jussi Kivilinna --- cipher/chacha20-ppc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cipher/chacha20-ppc.c b/cipher/chacha20-ppc.c index fe991b08..e640010a 100644 --- a/cipher/chacha20-ppc.c +++ b/cipher/chacha20-ppc.c @@ -330,7 +330,7 @@ chacha20_ppc_blocks4(u32 *state, byte *dst, const byte *src, size_t nblks) v15 = vec_splat(state3, 3); v12 += counters_0123; - v13 -= vec_cmplt(v12, counters_0123); + v13 -= (vector4x_u32)vec_cmplt(v12, counters_0123); for (i = 20; i > 0; i -= 2) { @@ -355,7 +355,7 @@ chacha20_ppc_blocks4(u32 *state, byte *dst, const byte *src, size_t nblks) tmp = vec_splat(state3, 0); tmp += counters_0123; v12 += tmp; - v13 += vec_splat(state3, 1) - vec_cmplt(tmp, counters_0123); + v13 += vec_splat(state3, 1) - (vector4x_u32)vec_cmplt(tmp, counters_0123); v14 += vec_splat(state3, 2); v15 += vec_splat(state3, 3); ADD_U64(state3, counter_4); /* update counter */ @@ -532,7 +532,7 @@ chacha20_poly1305_ppc_blocks4(u32 *state, byte *dst, const byte *src, v15 = vec_splat(state3, 3); v12 += counters_0123; - v13 -= vec_cmplt(v12, counters_0123); + v13 -= (vector4x_u32)vec_cmplt(v12, counters_0123); for (o = 20; o; o -= 10) { @@ -570,7 +570,7 @@ chacha20_poly1305_ppc_blocks4(u32 *state, byte *dst, const byte *src, tmp = vec_splat(state3, 0); tmp += counters_0123; v12 += tmp; - v13 += vec_splat(state3, 1) - vec_cmplt(tmp, counters_0123); + v13 += vec_splat(state3, 1) - (vector4x_u32)vec_cmplt(tmp, counters_0123); v14 += vec_splat(state3, 2); v15 += vec_splat(state3, 3); ADD_U64(state3, counter_4); /* update counter */ -- 2.43.0 From rms at gnu.org Sat Jun 22 04:47:50 2024 From: rms at gnu.org (Richard Stallman) Date: Fri, 21 Jun 2024 22:47:50 -0400 Subject: Libgcrypt 1.11.0 released In-Reply-To: <87le31nn7k.fsf@jacob.g10code.de> (message from Werner Koch on Wed, 19 Jun 2024 14:14:55 +0200) References: <87le31nn7k.fsf@jacob.g10code.de> Message-ID: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] Congratulations on the new release. -- Dr Richard Stallman (https://stallman.org) Chief GNUisance of the GNU Project (https://gnu.org) Founder, Free Software Foundation (https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org) From hsk17 at mail.de Mon Jun 24 16:39:13 2024 From: hsk17 at mail.de (Friedrich Haubensak) Date: Mon, 24 Jun 2024 16:39:13 +0200 Subject: [PATCH] random:cipher: handle substitution in sed command In-Reply-To: <20240611015228.1886303-1-simit.ghane@lge.com> References: <20240611015228.1886303-1-simit.ghane@lge.com> Message-ID: dear all, the patch below did not make it yet into the libgcrypt source tree. Note: cipher/Makefile.am up to now did not have the g flag at the first -e.... -- i can not judge if it would be a Good Thing to add it (probably it is :-). but the patch to random/Makefile.am seems neccessary: g flag at the first -e's....' in random/Makefile.am was dropped in b99952a on 7 May 2024. unfortunately, the missing g flag now breaks install of libgcrypt-1.11.0 in "gentoo prefix" instance, as some automagic there inserts a double "-O2 -pipe" into the CFLAGS during build. thank you for consideration. On 6/11/24 03:52, simit.ghane at lge.com (simit.ghane) wrote: > It was there earlier and accidentally removed from > Makefile.am of cipher and random > > Signed-off-by: simit.ghane > --- > cipher/Makefile.am | 2 +- > random/Makefile.am | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/cipher/Makefile.am b/cipher/Makefile.am > index a914ed2ba4..956ca345e3 100644 > --- a/cipher/Makefile.am > +++ b/cipher/Makefile.am > @@ -168,7 +168,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c > > > if ENABLE_O_FLAG_MUNGING > -o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' > +o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g' > else > o_flag_munging = cat > endif > diff --git a/random/Makefile.am b/random/Makefile.am > index c7100ef8b8..a42e430649 100644 > --- a/random/Makefile.am > +++ b/random/Makefile.am > @@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h > > # The rndjent module needs to be compiled without optimization. */ > if ENABLE_O_FLAG_MUNGING > -o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g' > +o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g' > else > o_flag_munging = cat > endif From jussi.kivilinna at iki.fi Mon Jun 24 21:09:26 2024 From: jussi.kivilinna at iki.fi (Jussi Kivilinna) Date: Mon, 24 Jun 2024 22:09:26 +0300 Subject: [PATCH] random:cipher: handle substitution in sed command In-Reply-To: References: <20240611015228.1886303-1-simit.ghane@lge.com> Message-ID: Hello, On 24.6.2024 17.39, Friedrich Haubensak via Gcrypt-devel wrote: > > dear all, > > the patch below did not make it yet into the libgcrypt source tree. Note: cipher/Makefile.am up to now did not have the g flag at the first -e.... -- i can not judge if it would be a Good Thing to add it (probably it is :-).? but the patch to random/Makefile.am seems neccessary: > > g flag at the first -e's....' in random/Makefile.am was dropped in b99952a on 7 May 2024.? unfortunately, the missing g flag now breaks install of libgcrypt-1.11.0 in "gentoo prefix" instance, as some automagic there inserts a double "-O2 -pipe" into the CFLAGS during build. > > thank you for consideration. Thanks for reminder, this had fallen through the cracks. Patch has been applied to master branch. -Jussi > > > On 6/11/24 03:52, simit.ghane at lge.com (simit.ghane) wrote: >> It was there earlier and accidentally removed from >> Makefile.am of cipher and random >> >> Signed-off-by: simit.ghane >> --- >> ? cipher/Makefile.am | 2 +- >> ? random/Makefile.am | 2 +- >> ? 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/cipher/Makefile.am b/cipher/Makefile.am >> index a914ed2ba4..956ca345e3 100644 >> --- a/cipher/Makefile.am >> +++ b/cipher/Makefile.am >> @@ -168,7 +168,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c >> ? if ENABLE_O_FLAG_MUNGING >> -o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' >> +o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g' >> ? else >> ? o_flag_munging = cat >> ? endif >> diff --git a/random/Makefile.am b/random/Makefile.am >> index c7100ef8b8..a42e430649 100644 >> --- a/random/Makefile.am >> +++ b/random/Makefile.am >> @@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h >> ? # The rndjent module needs to be compiled without optimization.? */ >> ? if ENABLE_O_FLAG_MUNGING >> -o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g' >> +o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g' >> ? else >> ? o_flag_munging = cat >> ? endif > > _______________________________________________ > Gcrypt-devel mailing list > Gcrypt-devel at gnupg.org > https://lists.gnupg.org/mailman/listinfo/gcrypt-devel From jussi.kivilinna at iki.fi Mon Jun 24 21:06:28 2024 From: jussi.kivilinna at iki.fi (Jussi Kivilinna) Date: Mon, 24 Jun 2024 22:06:28 +0300 Subject: [PATCH] random:cipher: handle substitution in sed command In-Reply-To: <20240611015228.1886303-1-simit.ghane@lge.com> References: <20240611015228.1886303-1-simit.ghane@lge.com> Message-ID: <8ede4e0c-d893-4c15-9a02-9acb6426d62a@iki.fi> Hello, On 11.6.2024 4.52, simit.ghane wrote: > It was there earlier and accidentally removed from > Makefile.am of cipher and random Thanks, patch has been applied to master now. -Jussi > > Signed-off-by: simit.ghane > --- > cipher/Makefile.am | 2 +- > random/Makefile.am | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/cipher/Makefile.am b/cipher/Makefile.am > index a914ed2ba4..956ca345e3 100644 > --- a/cipher/Makefile.am > +++ b/cipher/Makefile.am > @@ -168,7 +168,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c > > > if ENABLE_O_FLAG_MUNGING > -o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' > +o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g' > else > o_flag_munging = cat > endif > diff --git a/random/Makefile.am b/random/Makefile.am > index c7100ef8b8..a42e430649 100644 > --- a/random/Makefile.am > +++ b/random/Makefile.am > @@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h > > # The rndjent module needs to be compiled without optimization. */ > if ENABLE_O_FLAG_MUNGING > -o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g' > +o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g' > else > o_flag_munging = cat > endif