Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- ./openssl__chacha20_poly1305_cf.patch.original 2015-04-16 00:05:11.000000000 -0400
- +++ ./openssl__chacha20_poly1305_cf.patch 2015-04-20 19:51:15.847949654 -0400
- @@ -4209,24 +4209,6 @@ index 28129f6..5fd5633 100644
- }
- tls1_set_cert_validity(s);
- -@@ -4093,12 +4148,17 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
- - /* Skip TLS v1.2 only ciphersuites if not supported */
- - if ((c->algorithm_ssl & SSL_TLSV1_2) && !SSL_USE_TLS1_2_CIPHERS(s))
- - continue;
- -+ /* Skip ChaCha unless top client priority */
- -+ if ((c->algorithm_enc == SSL_CHACHA20POLY1305) &&
- -+ !use_chacha)
- -+ continue;
- -
- - ssl_set_cert_masks(cert, c);
- - mask_k = cert->mask_k;
- - mask_a = cert->mask_a;
- - emask_k = cert->export_mask_k;
- - emask_a = cert->export_mask_a;
- -+
- - #ifndef OPENSSL_NO_SRP
- - if (s->srp_ctx.srp_Mask & SSL_kSRP) {
- - mask_k |= SSL_kSRP;
- diff --git a/ssl/ssl.h b/ssl/ssl.h
- index 2b0f662..af660bc 100644
- --- a/ssl/ssl.h
- --- ./PKGBUILD.original 2015-04-17 11:34:58.000000000 -0400
- +++ ./PKGBUILD 2015-04-20 19:52:17.535784089 -0400
- @@ -27,7 +27,7 @@ md5sums=('a06c547dac9044161a477211049f60
- 'SKIP'
- 'dc78d3d06baffc16217519242ce92478'
- '3bf51be3a1bbd262be46dc619f92aa90'
- - '8519a15448955b50ade50ac96cf22a61')
- + '4c2f12fa70ce68aefcf7a2b7b6505a08')
- validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
- prepare() {
- @@ -51,6 +51,9 @@ build() {
- elif [ "${CARCH}" == 'i686' ]; then
- openssltarget='linux-elf'
- optflags=''
- + elif [ "${CARCH}" == 'armv6h' ]; then
- + openssltarget='linux-armv4'
- + optflags=''
- fi
- # mark stack as non-executable: http://bugs.archlinux.org/task/12434
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement