[openssl-dev] Still seeing errors in Openssl 1.1 pre

[Viktor Dukhovni]

> On Jan 13, 2016, at 3:32 AM, The Doctor <doctor at doctor.nl2k.ab.ca> wrote:
> 
> gcc -I.. -I../.. -I../modes -I../include -I../../include  -fPIC -DOPENSSL_PIC -
> DZLIB_SHARED -DZLIB -DOPENSSL_THREADS -pthread -D_THREAD_SAFE -D_REENTRANT -DDS
> O_DLFCN -DHAVE_DLFCN_H -DPERL5 -DL_ENDIAN -DTERMIOS -fomit-frame-pointer -O2 -m
> arch=i486 -Wall -g -DOPENSSL_EXPERIMENTAL_JPAKE -DOPENSSL_EXPERIMENTAL_STORE -D
> OPENSSL_BN_ASM_PART_WORDS -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_AS
> M -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DGHASH_ASM -DECP_
> NISTZ256_ASM -c e_rc5.c

RC5 is disabled by default, so this did not get caught.  The fix is simple:

openssl base64 -d <<EOF | gunzip -c | patch -p1 crypto/evp/e_rc5.c
H4sIAAwTllYAA22OXQuCMBSG7/crDna5Nqf4QRAxiO5CI3+AzLnlQqaoRf37ZlcR
uzlwzsPznrc1WgMhN7OACOX0HpchVM8xVPUkUyqh8RyRsa16AYtykYuGUrHLdSwY
RIxlSYIIId4shDH253EOJIu3GWA3c+AcwcZo90RDeTkVVXWui7K+HlMEjoCxsn+0
CvbDqOw892sW7Q4I/yBjFzVZ8WW1W1buU4fmruQy/+FgtfpB9rQLvNra2ykfJ37L
CD4BAAA=
EOF

-- 
	Viktor.

Which decodes to:

diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c
index 017a7ab..a97f2a0 100644
--- a/crypto/evp/e_rc5.c
+++ b/crypto/evp/e_rc5.c
@@ -62,6 +62,7 @@
#ifndef OPENSSL_NO_RC5

# include <openssl/evp.h>
+# include <internal/evp_int.h>
# include <openssl/objects.h>
# include "evp_locl.h"
# include <openssl/rc5.h>

-- 
	Viktor.