cloudflare / sslconfig

Cloudflare's Internet facing SSL configuration
BSD 3-Clause "New" or "Revised" License
1.3k stars 132 forks source link

Syntax error: word unexpected #59

Open nguyentumine opened 7 years ago

nguyentumine commented 7 years ago

Its work on CentOS 6 but not on FreeBSD, please help me! Thank you...

wget https://raw.githubusercontent.com/cloudflare/sslconfig/master/patches/openssl__chacha20_poly1305_draft_and_rfc_ossl102j.patch
patch -p1 < openssl__chacha20_poly1305_draft_and_rfc_ossl102j.patch
....................................................................
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From dcf9b5698b8658c9248327b3fdb280090c5c78ec Mon Sep 17 00:00:00 2001
|From: vkrasnov <vlad@cloudflare.com>
|Date: Tue, 4 Oct 2016 15:47:32 -0700
|Subject: [PATCH] ChaCha20-Poly1305 draft and RFC cipher suites for OpenSSL
| 1.0.2j
|
|---
| Configure                                          |   44 +-
| Makefile.org                                       |    4 +-
| crypto/chacha20_poly1305/Makefile                  |   89 +
| .../asm/chacha20_poly1305_x86_64.pl                | 2299 ++++++++++++++++++++
| crypto/chacha20_poly1305/asm/chacha20_x86_64.pl    |  415 ++++
| crypto/chacha20_poly1305/asm/poly1305_x86_64.pl    |  280 +++
| crypto/chacha20_poly1305/chacha20.c                |  142 ++
| crypto/chacha20_poly1305/chacha20poly1305.h        |   64 +
| crypto/chacha20_poly1305/poly1305.c                |  355 +++
| crypto/evp/Makefile                                |    8 +-
| crypto/evp/c_allc.c                                |    5 +
| crypto/evp/e_chacha20_poly1305.c                   |  362 +++
| crypto/evp/evp.h                                   |    5 +
| crypto/objects/obj_dat.h                           |   13 +-
| crypto/objects/obj_mac.h                           |    8 +
| crypto/objects/obj_mac.num                         |    2 +
| crypto/objects/objects.txt                         |    2 +
| ssl/s3_lib.c                                       |  128 +-
| ssl/ssl.h                                          |    2 +
| ssl/ssl_ciph.c                                     |   31 +-
| ssl/ssl_locl.h                                     |    2 +
| ssl/tls1.h                                         |   26 +
| 22 files changed, 4260 insertions(+), 26 deletions(-)
| create mode 100644 crypto/chacha20_poly1305/Makefile
| create mode 100755 crypto/chacha20_poly1305/asm/chacha20_poly1305_x86_64.pl
| create mode 100644 crypto/chacha20_poly1305/asm/chacha20_x86_64.pl
| create mode 100644 crypto/chacha20_poly1305/asm/poly1305_x86_64.pl
| create mode 100644 crypto/chacha20_poly1305/chacha20.c
| create mode 100644 crypto/chacha20_poly1305/chacha20poly1305.h
| create mode 100644 crypto/chacha20_poly1305/poly1305.c
| create mode 100644 crypto/evp/e_chacha20_poly1305.c
|
|diff --git a/Configure b/Configure
|index c39f71a..f5f7c06 100755
|--- a/Configure
|+++ b/Configure
--------------------------
Patching file Configure using Plan A...
Hunk #1 succeeded at 150.
Hunk #2 succeeded at 179.
Hunk #3 succeeded at 713.
Hunk #4 succeeded at 1240.
Hunk #5 succeeded at 1409.
Hunk #6 succeeded at 1625.
Hunk #7 succeeded at 1758.
Hunk #8 succeeded at 1820.
Hunk #9 succeeded at 2220.
Hunk #10 succeeded at 2250.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/Makefile.org b/Makefile.org
|index 2377f50..1f20a61 100644
|--- a/Makefile.org
|+++ b/Makefile.org
--------------------------
Patching file Makefile.org using Plan A...
Hunk #1 succeeded at 103.
Hunk #2 succeeded at 150.
Hunk #3 succeeded at 241.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/chacha20_poly1305/Makefile b/crypto/chacha20_poly1305/Makef                                                                                                             ile
|new file mode 100644
|index 0000000..87f4ba3
|--- /dev/null
|+++ b/crypto/chacha20_poly1305/Makefile
--------------------------
(Creating file crypto/chacha20_poly1305/Makefile...)
Patching file crypto/chacha20_poly1305/Makefile using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/chacha20_poly1305/asm/chacha20_poly1305_x86_64.pl b/crypto/                                                                                                             chacha20_poly1305/asm/chacha20_poly1305_x86_64.pl
|new file mode 100755
|index 0000000..ef90831
|--- /dev/null
|+++ b/crypto/chacha20_poly1305/asm/chacha20_poly1305_x86_64.pl
--------------------------
(Creating file crypto/chacha20_poly1305/asm/chacha20_poly1305_x86_64.pl...)
Patching file crypto/chacha20_poly1305/asm/chacha20_poly1305_x86_64.pl using Pla                                                                                                             n A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/chacha20_poly1305/asm/chacha20_x86_64.pl b/crypto/chacha20_                                                                                                             poly1305/asm/chacha20_x86_64.pl
|new file mode 100644
|index 0000000..538af42
|--- /dev/null
|+++ b/crypto/chacha20_poly1305/asm/chacha20_x86_64.pl
--------------------------
(Creating file crypto/chacha20_poly1305/asm/chacha20_x86_64.pl...)
Patching file crypto/chacha20_poly1305/asm/chacha20_x86_64.pl using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/chacha20_poly1305/asm/poly1305_x86_64.pl b/crypto/chacha20_                                                                                                             poly1305/asm/poly1305_x86_64.pl
|new file mode 100644
|index 0000000..05e4bc5
|--- /dev/null
|+++ b/crypto/chacha20_poly1305/asm/poly1305_x86_64.pl
--------------------------
(Creating file crypto/chacha20_poly1305/asm/poly1305_x86_64.pl...)
Patching file crypto/chacha20_poly1305/asm/poly1305_x86_64.pl using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/chacha20_poly1305/chacha20.c b/crypto/chacha20_poly1305/cha                                                                                                             cha20.c
|new file mode 100644
|index 0000000..b48d857
|--- /dev/null
|+++ b/crypto/chacha20_poly1305/chacha20.c
--------------------------
(Creating file crypto/chacha20_poly1305/chacha20.c...)
Patching file crypto/chacha20_poly1305/chacha20.c using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/chacha20_poly1305/chacha20poly1305.h b/crypto/chacha20_poly                                                                                                             1305/chacha20poly1305.h
|new file mode 100644
|index 0000000..3968c40
|--- /dev/null
|+++ b/crypto/chacha20_poly1305/chacha20poly1305.h
--------------------------
(Creating file crypto/chacha20_poly1305/chacha20poly1305.h...)
Patching file crypto/chacha20_poly1305/chacha20poly1305.h using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/chacha20_poly1305/poly1305.c b/crypto/chacha20_poly1305/pol                                                                                                             y1305.c
|new file mode 100644
|index 0000000..6bd553b
|--- /dev/null
|+++ b/crypto/chacha20_poly1305/poly1305.c
--------------------------
(Creating file crypto/chacha20_poly1305/poly1305.c...)
Patching file crypto/chacha20_poly1305/poly1305.c using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
|index fa138d0..c87896b 100644
|--- a/crypto/evp/Makefile
|+++ b/crypto/evp/Makefile
--------------------------
Patching file crypto/evp/Makefile using Plan A...
Hunk #1 succeeded at 29.
Hunk #2 succeeded at 43.
Hunk #3 succeeded at 795.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
|index 280e584..694f168 100644
|--- a/crypto/evp/c_allc.c
|+++ b/crypto/evp/c_allc.c
--------------------------
Patching file crypto/evp/c_allc.c using Plan A...
Hunk #1 succeeded at 238.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.                                                                                                             c
|new file mode 100644
|index 0000000..1e072ec
|--- /dev/null
|+++ b/crypto/evp/e_chacha20_poly1305.c
--------------------------
(Creating file crypto/evp/e_chacha20_poly1305.c...)
Patching file crypto/evp/e_chacha20_poly1305.c using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
|index 39ab793..8feaabc 100644
|--- a/crypto/evp/evp.h
|+++ b/crypto/evp/evp.h
--------------------------
Patching file crypto/evp/evp.h using Plan A...
Hunk #1 succeeded at 902.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
|index b7e3cf2..26612e2 100644
|--- a/crypto/objects/obj_dat.h
|+++ b/crypto/objects/obj_dat.h
--------------------------
Patching file crypto/objects/obj_dat.h using Plan A...
Hunk #1 succeeded at 62.
Hunk #2 succeeded at 2514.
Hunk #3 succeeded at 2577.
Hunk #4 succeeded at 3733.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
|index 779c309..35a2364 100644
|--- a/crypto/objects/obj_mac.h
|+++ b/crypto/objects/obj_mac.h
--------------------------
Patching file crypto/objects/obj_mac.h using Plan A...
Hunk #1 succeeded at 4047.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
|index 8e5ea83..a3da329 100644
|--- a/crypto/objects/obj_mac.num
|+++ b/crypto/objects/obj_mac.num
--------------------------
Patching file crypto/objects/obj_mac.num using Plan A...
Hunk #1 succeeded at 955.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
|index b57aabb..6a34a33 100644
|--- a/crypto/objects/objects.txt
|+++ b/crypto/objects/objects.txt
--------------------------
Patching file crypto/objects/objects.txt using Plan A...
Hunk #1 succeeded at 1294.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
|index 0385e03..65fdc59 100644
|--- a/ssl/s3_lib.c
|+++ b/ssl/s3_lib.c
--------------------------
Patching file ssl/s3_lib.c using Plan A...
Hunk #1 succeeded at 2945.
Hunk #2 succeeded at 4194.
Hunk #3 succeeded at 4224.
Hunk #4 succeeded at 4250.
Hunk #5 succeeded at 4334.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/ssl/ssl.h b/ssl/ssl.h
|index 90aeb0c..f783baa 100644
|--- a/ssl/ssl.h
|+++ b/ssl/ssl.h
--------------------------
Patching file ssl/ssl.h using Plan A...
Hunk #1 succeeded at 297.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
|index 2ad8f43..23c1c68 100644
|--- a/ssl/ssl_ciph.c
|+++ b/ssl/ssl_ciph.c
--------------------------
Patching file ssl/ssl_ciph.c using Plan A...
Hunk #1 succeeded at 164.
Hunk #2 succeeded at 317.
Hunk #3 succeeded at 435.
Hunk #4 succeeded at 590.
Hunk #5 succeeded at 820.
Hunk #6 succeeded at 1845.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
|index 6df725f..dbe68f2 100644
|--- a/ssl/ssl_locl.h
|+++ b/ssl/ssl_locl.h
--------------------------
Patching file ssl/ssl_locl.h using Plan A...
Hunk #1 succeeded at 354.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/ssl/tls1.h b/ssl/tls1.h
|index 7e237d0..ff2e259 100644
|--- a/ssl/tls1.h
|+++ b/ssl/tls1.h
--------------------------
Patching file ssl/tls1.h using Plan A...
Hunk #1 succeeded at 563.
Hunk #2 succeeded at 726.
Hmm...  Ignoring the trailing garbage.
done
....................................................................
./config --prefix=/root/openssl/.openssl no-shared
make
make install
....................................................................
making install in crypto/pqueue...
making install in crypto/ts...
making install in crypto/srp...
making install in crypto/cmac...
making install in crypto/chacha20_poly1305...
Syntax error: word unexpected
*** Error code 2

Stop.
make[2]: stopped in /root/openssl-1.0.2j/crypto/chacha20_poly1305
*** Error code 1

Stop.
make[1]: stopped in /root/openssl-1.0.2j/crypto
*** Error code 1

Stop.
make: stopped in /root/openssl-1.0.2j