On Wed, Feb 17, 2016, at 06:05 PM, Salz, Rich wrote:
>
> > (1) 1.0.2f + cloudflare patch
> > (2) 1.1.0-alpha3
>
> Did CF update their patch to the official version and codepoints? Cool.
>
Apparently. But 1st try has one glitch ...
patch -p1 < openssl__chacha20_poly1305_draft_and_rfc_ossl102f.patch
patching file Configure
patching file Makefile.org
patching file apps/speed.c
patching file crypto/chacha20poly1305/Makefile
patching file crypto/chacha20poly1305/asm/chacha20_avx.pl
patching file crypto/chacha20poly1305/asm/chacha20_avx2.pl
patching file crypto/chacha20poly1305/asm/poly1305_avx.pl
patching file crypto/chacha20poly1305/asm/poly1305_avx2.pl
patching file crypto/chacha20poly1305/asm/poly1305_x64.pl
patching file crypto/chacha20poly1305/chacha20.c
patching file crypto/chacha20poly1305/chacha20poly1305.h
patching file crypto/chacha20poly1305/chapolytest.c
patching file crypto/chacha20poly1305/poly1305.c
patching file crypto/cryptlib.c
patching file crypto/evp/Makefile
patching file crypto/evp/e_chacha20poly1305.c
patching file crypto/evp/evp.h
patching file ssl/s3_lib.c
patching file ssl/ssl.h
patching file ssl/ssl_ciph.c
patching file ssl/ssl_locl.h
patching file ssl/tls1.h
patching file test/Makefile
Hunk #8 FAILED at 614.
1 out of 8 hunks FAILED -- saving rejects to file test/Makefile.rej
cat test/Makefile.rej
--- test/Makefile
+++ test/Makefile
@@ -614,6 +622,7 @@ clienthellotest.o: clienthellotest.c
constant_time_test.o: ../crypto/constant_time_locl.h ../e_os.h
constant_time_test.o: ../include/openssl/e_os2.h
constant_time_test.o: ../include/openssl/opensslconf.h
constant_time_test.c
+chapolytest.o: ../include/openssl/chacha20poly1305.h chapolytest.c
destest.o: ../include/openssl/des.h ../include/openssl/des_old.h
destest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
destest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
--
openssl-users mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-users
