Advertisement
Guest User

/etc/customizepkg.d/openssl-chacha20

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