components/samba/patches/hcrypto.patch
author Jiri Sasek <Jiri.Sasek@Oracle.COM>
Thu, 07 Apr 2016 18:24:13 -0700
branchs11u3-sru
changeset 7067 776b367d2e46
permissions -rw-r--r--
24354183 Samba: Update to 4.4.5 23071523 Access denied if the share path is "/" . 23088978 problem in UTILITY/SAMBA 23088910 problem in UTILITY/SAMBA 23088950 problem in UTILITY/SAMBA 23088868 problem in UTILITY/SAMBA 23088773 problem in UTILITY/SAMBA 23088523 problem in UTILITY/SAMBA 23074375 problem in UTILITY/SAMBA 24302327 problem in UTILITY/SAMBA
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7067
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     1
Source: Home brewed
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     2
Fixes: overloaded ERR definition
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     3
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     4
--- a/source4/heimdal/lib/hcrypto/libtommath/bn_mp_karatsuba_mul.c	2013-06-13 02:21:02.000000000 -0700
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     5
+++ samba-4.1.4/source4/heimdal/lib/hcrypto/libtommath/bn_mp_karatsuba_mul.c	2014-02-18 05:51:05.518085627 -0800
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     6
@@ -44,6 +44,7 @@
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     7
  * Generally though the overhead of this method doesn't pay off
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     8
  * until a certain size (N ~ 80) is reached.
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     9
  */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    10
+#undef ERR
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    11
 int mp_karatsuba_mul (mp_int * a, mp_int * b, mp_int * c)
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    12
 {
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    13
   mp_int  x0, x1, y0, y1, t1, x0y0, x1y1;
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    14
--- a/source4/heimdal/lib/hcrypto/libtommath/bn_mp_karatsuba_sqr.c	2013-06-13 02:21:02.000000000 -0700
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    15
+++ samba-4.1.4/source4/heimdal/lib/hcrypto/libtommath/bn_mp_karatsuba_sqr.c	2014-02-18 05:52:07.020144267 -0800
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    16
@@ -22,6 +22,7 @@
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    17
  * is essentially the same algorithm but merely
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    18
  * tuned to perform recursive squarings.
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    19
  */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    20
+#undef ERR
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    21
 int mp_karatsuba_sqr (mp_int * a, mp_int * b)
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    22
 {
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    23
   mp_int  x0, x1, t1, t2, x0x0, x1x1;
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    24
--- a/source4/heimdal/lib/hcrypto/libtommath/bn_mp_toom_sqr.c	2013-06-13 02:21:02.000000000 -0700
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    25
+++ samba-4.1.4/source4/heimdal/lib/hcrypto/libtommath/bn_mp_toom_sqr.c	2014-02-18 05:54:10.993497897 -0800
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    26
@@ -14,6 +14,7 @@
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    27
  *
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    28
  * Tom St Denis, [email protected], http://libtom.org
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    29
  */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    30
+#undef ERR
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    31
 
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    32
 /* squaring using Toom-Cook 3-way algorithm */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    33
 int
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    34
--- a/source4/heimdal/lib/hcrypto/libtommath/bn_mp_toom_mul.c	2013-06-13 02:21:02.000000000 -0700
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    35
+++ samba-4.1.4/source4/heimdal/lib/hcrypto/libtommath/bn_mp_toom_mul.c	2014-02-18 05:48:52.888293183 -0800
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    36
@@ -22,6 +22,7 @@
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    37
  * only particularly useful on VERY large inputs
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    38
  * (we're talking 1000s of digits here...).
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    39
 */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    40
+#undef ERR
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    41
 int mp_toom_mul(mp_int *a, mp_int *b, mp_int *c)
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    42
 {
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    43
     mp_int w0, w1, w2, w3, w4, tmp1, tmp2, a0, a1, a2, b0, b1, b2;
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    44
--- a/source4/heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k.c	2013-06-13 02:21:02.000000000 -0700
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    45
+++ samba-4.1.4/source4/heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k.c	2014-02-18 06:00:05.098527808 -0800
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    46
@@ -14,6 +14,7 @@
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    47
  *
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    48
  * Tom St Denis, [email protected], http://libtom.org
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    49
  */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    50
+#undef ERR
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    51
 
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    52
 /* reduces a modulo n where n is of the form 2**p - d */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    53
 int mp_reduce_2k(mp_int *a, mp_int *n, mp_digit d)
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    54
--- a/source4/heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_l.c	2013-06-13 02:21:02.000000000 -0700
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    55
+++ samba-4.1.4/source4/heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_l.c	2014-02-18 06:01:32.514873634 -0800
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    56
@@ -14,6 +14,7 @@
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    57
  *
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    58
  * Tom St Denis, [email protected], http://libtom.org
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    59
  */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    60
+#undef ERR
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    61
 
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    62
 /* reduces a modulo n where n is of the form 2**p - d
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    63
    This differs from reduce_2k since "d" can be larger
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    64
--- a/source4/heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup_l.c	2013-06-13 02:21:02.000000000 -0700
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    65
+++ samba-4.1.4/source4/heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup_l.c	2014-02-18 06:01:04.034539817 -0800
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    66
@@ -14,6 +14,7 @@
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    67
  *
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    68
  * Tom St Denis, [email protected], http://libtom.org
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    69
  */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    70
+#undef ERR
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    71
 
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    72
 /* determines the setup value */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    73
 int mp_reduce_2k_setup_l(mp_int *a, mp_int *d)
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    74
--- a/source4/heimdal/lib/hcrypto/libtommath/bn_mp_is_square.c	2013-06-13 02:21:02.000000000 -0700
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    75
+++ samba-4.1.4/source4/heimdal/lib/hcrypto/libtommath/bn_mp_is_square.c	2014-02-18 06:05:49.598152405 -0800
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    76
@@ -14,6 +14,7 @@
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    77
  *
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    78
  * Tom St Denis, [email protected], http://libtom.org
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    79
  */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    80
+#undef ERR
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    81
 
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    82
 /* Check if remainders are possible squares - fast exclude non-squares */
776b367d2e46 24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    83
 static const char rem_128[128] = {