Clean up line endings, execute bits, and other bits of errant nonsense from Windows.

10 files changed, 1072 insertions, 1072 deletions

diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/Manifest b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/Manifest
index a3d6a4c..6d1d7f8 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/Manifest
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/Manifest
@@ -1,27 +1,27 @@
-# Manifest - checksums 

-# Copyright 2003 Free Software Foundation, Inc.

-#

-# This file is part of Libgcrypt.

-#

-# Libgcrypt is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser general Public License as

-# published by the Free Software Foundation; either version 2.1 of

-# the License, or (at your option) any later version.

-#

-# Libgcrypt is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-# GNU Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this program; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

-

-mpih-add1.S

-mpih-mul1.S

-mpih-mul2.S

-mpih-mul3.S

-mpih-lshift.S

-mpih-rshift.S

-mpih-sub1.S

-$names$ iQCVAwUAP+LmQDEAnp832S/7AQKCmgQAhG+E7X0KB4qdVf3sMb6Qr+Iv5Jlehzoub/5vxTRgePKzRuOHidCnTzSSoyzA++UcHrOjHQQDMsXnO6PqpS1d/TKkxjnGN7rE8mvMYlFAT8RsawTozSfh14mCzI0HTDbaKL9Z8pcMJtadB3XqAuqWJNO8kyECJFwurt3DRWXSWS8==Rug5

+# Manifest - checksums 
+# Copyright 2003 Free Software Foundation, Inc.
+#
+# This file is part of Libgcrypt.
+#
+# Libgcrypt is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser general Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# Libgcrypt is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+mpih-add1.S
+mpih-mul1.S
+mpih-mul2.S
+mpih-mul3.S
+mpih-lshift.S
+mpih-rshift.S
+mpih-sub1.S
+$names$ iQCVAwUAP+LmQDEAnp832S/7AQKCmgQAhG+E7X0KB4qdVf3sMb6Qr+Iv5Jlehzoub/5vxTRgePKzRuOHidCnTzSSoyzA++UcHrOjHQQDMsXnO6PqpS1d/TKkxjnGN7rE8mvMYlFAT8RsawTozSfh14mCzI0HTDbaKL9Z8pcMJtadB3XqAuqWJNO8kyECJFwurt3DRWXSWS8==Rug5
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/README b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/README
index b698cba..d73b082 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/README
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/README
@@ -1,26 +1,26 @@
-This directory contains mpn functions optimized for Intel Pentium

-processors.

-

-RELEVANT OPTIMIZATION ISSUES

-

-1. Pentium doesn't allocate cache lines on writes, unlike most other modern

-processors.  Since the functions in the mpn class do array writes, we have to

-handle allocating the destination cache lines by reading a word from it in the

-loops, to achieve the best performance.

-

-2. Pairing of memory operations requires that the two issued operations refer

-to different cache banks.  The simplest way to insure this is to read/write

-two words from the same object.  If we make operations on different objects,

-they might or might not be to the same cache bank.

-

-STATUS

-

-1. mpn_lshift and mpn_rshift run at about 6 cycles/limb, but the Pentium

-documentation indicates that they should take only 43/8 = 5.375 cycles/limb,

-or 5 cycles/limb asymptotically.

-

-2. mpn_add_n and mpn_sub_n run at asymptotically 2 cycles/limb.  Due to loop

-overhead and other delays (cache refill?), they run at or near 2.5 cycles/limb.

-

-3. mpn_mul_1, mpn_addmul_1, mpn_submul_1 all run 1 cycle faster than they

-should...

+This directory contains mpn functions optimized for Intel Pentium
+processors.
+
+RELEVANT OPTIMIZATION ISSUES
+
+1. Pentium doesn't allocate cache lines on writes, unlike most other modern
+processors.  Since the functions in the mpn class do array writes, we have to
+handle allocating the destination cache lines by reading a word from it in the
+loops, to achieve the best performance.
+
+2. Pairing of memory operations requires that the two issued operations refer
+to different cache banks.  The simplest way to insure this is to read/write
+two words from the same object.  If we make operations on different objects,
+they might or might not be to the same cache bank.
+
+STATUS
+
+1. mpn_lshift and mpn_rshift run at about 6 cycles/limb, but the Pentium
+documentation indicates that they should take only 43/8 = 5.375 cycles/limb,
+or 5 cycles/limb asymptotically.
+
+2. mpn_add_n and mpn_sub_n run at asymptotically 2 cycles/limb.  Due to loop
+overhead and other delays (cache refill?), they run at or near 2.5 cycles/limb.
+
+3. mpn_mul_1, mpn_addmul_1, mpn_submul_1 all run 1 cycle faster than they
+should...
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/distfiles b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/distfiles
index f11658e..546f777 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/distfiles
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/distfiles
@@ -1,10 +1,10 @@
-Manifest

-mpih-add1.S

-mpih-mul1.S

-mpih-mul2.S

-mpih-mul3.S

-mpih-lshift.S

-mpih-rshift.S

-mpih-sub1.S

-README

-

+Manifest
+mpih-add1.S
+mpih-mul1.S
+mpih-mul2.S
+mpih-mul3.S
+mpih-lshift.S
+mpih-rshift.S
+mpih-sub1.S
+README
+
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-add1.S b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-add1.S
index 6068fcb..7436d59 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-add1.S
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-add1.S
@@ -1,135 +1,135 @@
-/* i80586 add_n -- Add two limb vectors of the same length > 0 and store

- *                 sum in a third limb vector.

- *

- *      Copyright (C) 1992, 1994, 1995, 1996, 1998,

- *                    2001, 2002 Free Software Foundation, Inc.

- *

- * This file is part of Libgcrypt.

- *

- * Libgcrypt is free software; you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License as

- * published by the Free Software Foundation; either version 2.1 of

- * the License, or (at your option) any later version.

- *

- * Libgcrypt is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

- */

-

-

-#include "sysdep.h"

-#include "asm-syntax.h"

-

-

-/*******************

- *  mpi_limb_t

- *  _gcry_mpih_add_n( mpi_ptr_t res_ptr,        (sp + 4)

- *                 mpi_ptr_t s1_ptr,    (sp + 8)

- *                 mpi_ptr_t s2_ptr,    (sp + 12)

- *                 mpi_size_t size)     (sp + 16)

- */

-

-.text

-        ALIGN (3)

-        .globl C_SYMBOL_NAME(_gcry_mpih_add_n)

-C_SYMBOL_NAME(_gcry_mpih_add_n:)

-        pushl   %edi

-        pushl   %esi

-        pushl   %ebx

-        pushl   %ebp

-

-        movl    20(%esp),%edi           /* res_ptr */

-        movl    24(%esp),%esi           /* s1_ptr */

-        movl    28(%esp),%ebp           /* s2_ptr */

-        movl    32(%esp),%ecx           /* size */

-

-        movl    (%ebp),%ebx

-

-        decl    %ecx

-        movl    %ecx,%edx

-        shrl    $3,%ecx

-        andl    $7,%edx

-        testl   %ecx,%ecx               /* zero carry flag */

-        jz      Lend

-        pushl   %edx

-

-        ALIGN (3)

-Loop:   movl    28(%edi),%eax           /* fetch destination cache line */

-        leal    32(%edi),%edi

-

-L1:     movl    (%esi),%eax

-        movl    4(%esi),%edx

-        adcl    %ebx,%eax

-        movl    4(%ebp),%ebx

-        adcl    %ebx,%edx

-        movl    8(%ebp),%ebx

-        movl    %eax,-32(%edi)

-        movl    %edx,-28(%edi)

-

-L2:     movl    8(%esi),%eax

-        movl    12(%esi),%edx

-        adcl    %ebx,%eax

-        movl    12(%ebp),%ebx

-        adcl    %ebx,%edx

-        movl    16(%ebp),%ebx

-        movl    %eax,-24(%edi)

-        movl    %edx,-20(%edi)

-

-L3:     movl    16(%esi),%eax

-        movl    20(%esi),%edx

-        adcl    %ebx,%eax

-        movl    20(%ebp),%ebx

-        adcl    %ebx,%edx

-        movl    24(%ebp),%ebx

-        movl    %eax,-16(%edi)

-        movl    %edx,-12(%edi)

-

-L4:     movl    24(%esi),%eax

-        movl    28(%esi),%edx

-        adcl    %ebx,%eax

-        movl    28(%ebp),%ebx

-        adcl    %ebx,%edx

-        movl    32(%ebp),%ebx

-        movl    %eax,-8(%edi)

-        movl    %edx,-4(%edi)

-

-        leal    32(%esi),%esi

-        leal    32(%ebp),%ebp

-        decl    %ecx

-        jnz     Loop

-

-        popl    %edx

-Lend:

-        decl    %edx                    /* test %edx w/o clobbering carry */

-        js      Lend2

-        incl    %edx

-Loop2:

-        leal    4(%edi),%edi

-        movl    (%esi),%eax

-        adcl    %ebx,%eax

-        movl    4(%ebp),%ebx

-        movl    %eax,-4(%edi)

-        leal    4(%esi),%esi

-        leal    4(%ebp),%ebp

-        decl    %edx

-        jnz     Loop2

-Lend2:

-        movl    (%esi),%eax

-        adcl    %ebx,%eax

-        movl    %eax,(%edi)

-

-        sbbl    %eax,%eax

-        negl    %eax

-

-        popl    %ebp

-        popl    %ebx

-        popl    %esi

-        popl    %edi

-        ret

-

-

+/* i80586 add_n -- Add two limb vectors of the same length > 0 and store
+ *                 sum in a third limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1995, 1996, 1998,
+ *                    2001, 2002 Free Software Foundation, Inc.
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * Libgcrypt is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+
+/*******************
+ *  mpi_limb_t
+ *  _gcry_mpih_add_n( mpi_ptr_t res_ptr,        (sp + 4)
+ *                 mpi_ptr_t s1_ptr,    (sp + 8)
+ *                 mpi_ptr_t s2_ptr,    (sp + 12)
+ *                 mpi_size_t size)     (sp + 16)
+ */
+
+.text
+        ALIGN (3)
+        .globl C_SYMBOL_NAME(_gcry_mpih_add_n)
+C_SYMBOL_NAME(_gcry_mpih_add_n:)
+        pushl   %edi
+        pushl   %esi
+        pushl   %ebx
+        pushl   %ebp
+
+        movl    20(%esp),%edi           /* res_ptr */
+        movl    24(%esp),%esi           /* s1_ptr */
+        movl    28(%esp),%ebp           /* s2_ptr */
+        movl    32(%esp),%ecx           /* size */
+
+        movl    (%ebp),%ebx
+
+        decl    %ecx
+        movl    %ecx,%edx
+        shrl    $3,%ecx
+        andl    $7,%edx
+        testl   %ecx,%ecx               /* zero carry flag */
+        jz      Lend
+        pushl   %edx
+
+        ALIGN (3)
+Loop:   movl    28(%edi),%eax           /* fetch destination cache line */
+        leal    32(%edi),%edi
+
+L1:     movl    (%esi),%eax
+        movl    4(%esi),%edx
+        adcl    %ebx,%eax
+        movl    4(%ebp),%ebx
+        adcl    %ebx,%edx
+        movl    8(%ebp),%ebx
+        movl    %eax,-32(%edi)
+        movl    %edx,-28(%edi)
+
+L2:     movl    8(%esi),%eax
+        movl    12(%esi),%edx
+        adcl    %ebx,%eax
+        movl    12(%ebp),%ebx
+        adcl    %ebx,%edx
+        movl    16(%ebp),%ebx
+        movl    %eax,-24(%edi)
+        movl    %edx,-20(%edi)
+
+L3:     movl    16(%esi),%eax
+        movl    20(%esi),%edx
+        adcl    %ebx,%eax
+        movl    20(%ebp),%ebx
+        adcl    %ebx,%edx
+        movl    24(%ebp),%ebx
+        movl    %eax,-16(%edi)
+        movl    %edx,-12(%edi)
+
+L4:     movl    24(%esi),%eax
+        movl    28(%esi),%edx
+        adcl    %ebx,%eax
+        movl    28(%ebp),%ebx
+        adcl    %ebx,%edx
+        movl    32(%ebp),%ebx
+        movl    %eax,-8(%edi)
+        movl    %edx,-4(%edi)
+
+        leal    32(%esi),%esi
+        leal    32(%ebp),%ebp
+        decl    %ecx
+        jnz     Loop
+
+        popl    %edx
+Lend:
+        decl    %edx                    /* test %edx w/o clobbering carry */
+        js      Lend2
+        incl    %edx
+Loop2:
+        leal    4(%edi),%edi
+        movl    (%esi),%eax
+        adcl    %ebx,%eax
+        movl    4(%ebp),%ebx
+        movl    %eax,-4(%edi)
+        leal    4(%esi),%esi
+        leal    4(%ebp),%ebp
+        decl    %edx
+        jnz     Loop2
+Lend2:
+        movl    (%esi),%eax
+        adcl    %ebx,%eax
+        movl    %eax,(%edi)
+
+        sbbl    %eax,%eax
+        negl    %eax
+
+        popl    %ebp
+        popl    %ebx
+        popl    %esi
+        popl    %edi
+        ret
+
+
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-lshift.S b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-lshift.S
index 8aa3224..9d25fe9 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-lshift.S
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-lshift.S
@@ -1,229 +1,229 @@
-/* i80586   lshift

- *

- *      Copyright (C) 1992, 1994, 1998, 

- *                    2001, 2002 Free Software Foundation, Inc.

- *

- * This file is part of Libgcrypt.

- *

- * Libgcrypt is free software; you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License as

- * published by the Free Software Foundation; either version 2.1 of

- * the License, or (at your option) any later version.

- *

- * Libgcrypt is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

- *

- * Note: This code is heavily based on the GNU MP Library.

- *       Actually it's the same code with only minor changes in the

- *       way the data is stored; this is to support the abstraction

- *       of an optional secure memory allocation which may be used

- *       to avoid revealing of sensitive data due to paging etc.

- */

-

-

-#include "sysdep.h"

-#include "asm-syntax.h"

-

-

-/*******************

- * mpi_limb_t

- * _gcry_mpih_lshift( mpi_ptr_t wp,     (sp + 4)

- *                 mpi_ptr_t up,        (sp + 8)

- *                 mpi_size_t usize,    (sp + 12)

- *                 unsigned cnt)        (sp + 16)

- */

-

-.text

-        ALIGN (3)

-        .globl C_SYMBOL_NAME(_gcry_mpih_lshift)

-C_SYMBOL_NAME(_gcry_mpih_lshift:)

-

-        pushl   %edi

-        pushl   %esi

-        pushl   %ebx

-        pushl   %ebp

-

-        movl    20(%esp),%edi           /* res_ptr */

-        movl    24(%esp),%esi           /* s_ptr */

-        movl    28(%esp),%ebp           /* size */

-        movl    32(%esp),%ecx           /* cnt */

-

-/* We can use faster code for shift-by-1 under certain conditions.  */

-        cmp     $1,%ecx

-        jne     Lnormal

-        leal    4(%esi),%eax

-        cmpl    %edi,%eax

-        jnc     Lspecial                /* jump if s_ptr + 1 >= res_ptr */

-        leal    (%esi,%ebp,4),%eax

-        cmpl    %eax,%edi

-        jnc     Lspecial                /* jump if res_ptr >= s_ptr + size */

-

-Lnormal:

-        leal    -4(%edi,%ebp,4),%edi

-        leal    -4(%esi,%ebp,4),%esi

-

-        movl    (%esi),%edx

-        subl    $4,%esi

-        xorl    %eax,%eax

-        shldl   %cl,%edx,%eax           /* compute carry limb */

-        pushl   %eax                    /* push carry limb onto stack */

-

-        decl    %ebp

-        pushl   %ebp

-        shrl    $3,%ebp

-        jz      Lend

-

-        movl    (%edi),%eax             /* fetch destination cache line */

-

-        ALIGN   (2)

-Loop:   movl    -28(%edi),%eax          /* fetch destination cache line */

-        movl    %edx,%ebx

-

-        movl    (%esi),%eax

-        movl    -4(%esi),%edx

-        shldl   %cl,%eax,%ebx

-        shldl   %cl,%edx,%eax

-        movl    %ebx,(%edi)

-        movl    %eax,-4(%edi)

-

-        movl    -8(%esi),%ebx

-        movl    -12(%esi),%eax

-        shldl   %cl,%ebx,%edx

-        shldl   %cl,%eax,%ebx

-        movl    %edx,-8(%edi)

-        movl    %ebx,-12(%edi)

-

-        movl    -16(%esi),%edx

-        movl    -20(%esi),%ebx

-        shldl   %cl,%edx,%eax

-        shldl   %cl,%ebx,%edx

-        movl    %eax,-16(%edi)

-        movl    %edx,-20(%edi)

-

-        movl    -24(%esi),%eax

-        movl    -28(%esi),%edx

-        shldl   %cl,%eax,%ebx

-        shldl   %cl,%edx,%eax

-        movl    %ebx,-24(%edi)

-        movl    %eax,-28(%edi)

-

-        subl    $32,%esi

-        subl    $32,%edi

-        decl    %ebp

-        jnz     Loop

-

-Lend:   popl    %ebp

-        andl    $7,%ebp

-        jz      Lend2

-Loop2:  movl    (%esi),%eax

-        shldl   %cl,%eax,%edx

-        movl    %edx,(%edi)

-        movl    %eax,%edx

-        subl    $4,%esi

-        subl    $4,%edi

-        decl    %ebp

-        jnz     Loop2

-

-Lend2:  shll    %cl,%edx                /* compute least significant limb */

-        movl    %edx,(%edi)             /* store it */

-

-        popl    %eax                    /* pop carry limb */

-

-        popl    %ebp

-        popl    %ebx

-        popl    %esi

-        popl    %edi

-        ret

-

-/* We loop from least significant end of the arrays, which is only

-   permissable if the source and destination don't overlap, since the

-   function is documented to work for overlapping source and destination.

-*/

-

-Lspecial:

-        movl    (%esi),%edx

-        addl    $4,%esi

-

-        decl    %ebp

-        pushl   %ebp

-        shrl    $3,%ebp

-

-        addl    %edx,%edx

-        incl    %ebp

-        decl    %ebp

-        jz      LLend

-

-        movl    (%edi),%eax             /* fetch destination cache line */

-

-        ALIGN   (2)

-LLoop:  movl    28(%edi),%eax           /* fetch destination cache line */

-        movl    %edx,%ebx

-

-        movl    (%esi),%eax

-        movl    4(%esi),%edx

-        adcl    %eax,%eax

-        movl    %ebx,(%edi)

-        adcl    %edx,%edx

-        movl    %eax,4(%edi)

-

-        movl    8(%esi),%ebx

-        movl    12(%esi),%eax

-        adcl    %ebx,%ebx

-        movl    %edx,8(%edi)

-        adcl    %eax,%eax

-        movl    %ebx,12(%edi)

-

-        movl    16(%esi),%edx

-        movl    20(%esi),%ebx

-        adcl    %edx,%edx

-        movl    %eax,16(%edi)

-        adcl    %ebx,%ebx

-        movl    %edx,20(%edi)

-

-        movl    24(%esi),%eax

-        movl    28(%esi),%edx

-        adcl    %eax,%eax

-        movl    %ebx,24(%edi)

-        adcl    %edx,%edx

-        movl    %eax,28(%edi)

-

-        leal    32(%esi),%esi           /* use leal not to clobber carry */

-        leal    32(%edi),%edi

-        decl    %ebp

-        jnz     LLoop

-

-LLend:  popl    %ebp

-        sbbl    %eax,%eax               /* save carry in %eax */

-        andl    $7,%ebp

-        jz      LLend2

-        addl    %eax,%eax               /* restore carry from eax */

-LLoop2: movl    %edx,%ebx

-        movl    (%esi),%edx

-        adcl    %edx,%edx

-        movl    %ebx,(%edi)

-

-        leal    4(%esi),%esi            /* use leal not to clobber carry */

-        leal    4(%edi),%edi

-        decl    %ebp

-        jnz     LLoop2

-

-        jmp     LL1

-LLend2: addl    %eax,%eax               /* restore carry from eax */

-LL1:    movl    %edx,(%edi)             /* store last limb */

-

-        sbbl    %eax,%eax

-        negl    %eax

-

-        popl    %ebp

-        popl    %ebx

-        popl    %esi

-        popl    %edi

-        ret

-

-

+/* i80586   lshift
+ *
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001, 2002 Free Software Foundation, Inc.
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * Libgcrypt is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *       Actually it's the same code with only minor changes in the
+ *       way the data is stored; this is to support the abstraction
+ *       of an optional secure memory allocation which may be used
+ *       to avoid revealing of sensitive data due to paging etc.
+ */
+
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+
+/*******************
+ * mpi_limb_t
+ * _gcry_mpih_lshift( mpi_ptr_t wp,     (sp + 4)
+ *                 mpi_ptr_t up,        (sp + 8)
+ *                 mpi_size_t usize,    (sp + 12)
+ *                 unsigned cnt)        (sp + 16)
+ */
+
+.text
+        ALIGN (3)
+        .globl C_SYMBOL_NAME(_gcry_mpih_lshift)
+C_SYMBOL_NAME(_gcry_mpih_lshift:)
+
+        pushl   %edi
+        pushl   %esi
+        pushl   %ebx
+        pushl   %ebp
+
+        movl    20(%esp),%edi           /* res_ptr */
+        movl    24(%esp),%esi           /* s_ptr */
+        movl    28(%esp),%ebp           /* size */
+        movl    32(%esp),%ecx           /* cnt */
+
+/* We can use faster code for shift-by-1 under certain conditions.  */
+        cmp     $1,%ecx
+        jne     Lnormal
+        leal    4(%esi),%eax
+        cmpl    %edi,%eax
+        jnc     Lspecial                /* jump if s_ptr + 1 >= res_ptr */
+        leal    (%esi,%ebp,4),%eax
+        cmpl    %eax,%edi
+        jnc     Lspecial                /* jump if res_ptr >= s_ptr + size */
+
+Lnormal:
+        leal    -4(%edi,%ebp,4),%edi
+        leal    -4(%esi,%ebp,4),%esi
+
+        movl    (%esi),%edx
+        subl    $4,%esi
+        xorl    %eax,%eax
+        shldl   %cl,%edx,%eax           /* compute carry limb */
+        pushl   %eax                    /* push carry limb onto stack */
+
+        decl    %ebp
+        pushl   %ebp
+        shrl    $3,%ebp
+        jz      Lend
+
+        movl    (%edi),%eax             /* fetch destination cache line */
+
+        ALIGN   (2)
+Loop:   movl    -28(%edi),%eax          /* fetch destination cache line */
+        movl    %edx,%ebx
+
+        movl    (%esi),%eax
+        movl    -4(%esi),%edx
+        shldl   %cl,%eax,%ebx
+        shldl   %cl,%edx,%eax
+        movl    %ebx,(%edi)
+        movl    %eax,-4(%edi)
+
+        movl    -8(%esi),%ebx
+        movl    -12(%esi),%eax
+        shldl   %cl,%ebx,%edx
+        shldl   %cl,%eax,%ebx
+        movl    %edx,-8(%edi)
+        movl    %ebx,-12(%edi)
+
+        movl    -16(%esi),%edx
+        movl    -20(%esi),%ebx
+        shldl   %cl,%edx,%eax
+        shldl   %cl,%ebx,%edx
+        movl    %eax,-16(%edi)
+        movl    %edx,-20(%edi)
+
+        movl    -24(%esi),%eax
+        movl    -28(%esi),%edx
+        shldl   %cl,%eax,%ebx
+        shldl   %cl,%edx,%eax
+        movl    %ebx,-24(%edi)
+        movl    %eax,-28(%edi)
+
+        subl    $32,%esi
+        subl    $32,%edi
+        decl    %ebp
+        jnz     Loop
+
+Lend:   popl    %ebp
+        andl    $7,%ebp
+        jz      Lend2
+Loop2:  movl    (%esi),%eax
+        shldl   %cl,%eax,%edx
+        movl    %edx,(%edi)
+        movl    %eax,%edx
+        subl    $4,%esi
+        subl    $4,%edi
+        decl    %ebp
+        jnz     Loop2
+
+Lend2:  shll    %cl,%edx                /* compute least significant limb */
+        movl    %edx,(%edi)             /* store it */
+
+        popl    %eax                    /* pop carry limb */
+
+        popl    %ebp
+        popl    %ebx
+        popl    %esi
+        popl    %edi
+        ret
+
+/* We loop from least significant end of the arrays, which is only
+   permissable if the source and destination don't overlap, since the
+   function is documented to work for overlapping source and destination.
+*/
+
+Lspecial:
+        movl    (%esi),%edx
+        addl    $4,%esi
+
+        decl    %ebp
+        pushl   %ebp
+        shrl    $3,%ebp
+
+        addl    %edx,%edx
+        incl    %ebp
+        decl    %ebp
+        jz      LLend
+
+        movl    (%edi),%eax             /* fetch destination cache line */
+
+        ALIGN   (2)
+LLoop:  movl    28(%edi),%eax           /* fetch destination cache line */
+        movl    %edx,%ebx
+
+        movl    (%esi),%eax
+        movl    4(%esi),%edx
+        adcl    %eax,%eax
+        movl    %ebx,(%edi)
+        adcl    %edx,%edx
+        movl    %eax,4(%edi)
+
+        movl    8(%esi),%ebx
+        movl    12(%esi),%eax
+        adcl    %ebx,%ebx
+        movl    %edx,8(%edi)
+        adcl    %eax,%eax
+        movl    %ebx,12(%edi)
+
+        movl    16(%esi),%edx
+        movl    20(%esi),%ebx
+        adcl    %edx,%edx
+        movl    %eax,16(%edi)
+        adcl    %ebx,%ebx
+        movl    %edx,20(%edi)
+
+        movl    24(%esi),%eax
+        movl    28(%esi),%edx
+        adcl    %eax,%eax
+        movl    %ebx,24(%edi)
+        adcl    %edx,%edx
+        movl    %eax,28(%edi)
+
+        leal    32(%esi),%esi           /* use leal not to clobber carry */
+        leal    32(%edi),%edi
+        decl    %ebp
+        jnz     LLoop
+
+LLend:  popl    %ebp
+        sbbl    %eax,%eax               /* save carry in %eax */
+        andl    $7,%ebp
+        jz      LLend2
+        addl    %eax,%eax               /* restore carry from eax */
+LLoop2: movl    %edx,%ebx
+        movl    (%esi),%edx
+        adcl    %edx,%edx
+        movl    %ebx,(%edi)
+
+        leal    4(%esi),%esi            /* use leal not to clobber carry */
+        leal    4(%edi),%edi
+        decl    %ebp
+        jnz     LLoop2
+
+        jmp     LL1
+LLend2: addl    %eax,%eax               /* restore carry from eax */
+LL1:    movl    %edx,(%edi)             /* store last limb */
+
+        sbbl    %eax,%eax
+        negl    %eax
+
+        popl    %ebp
+        popl    %ebx
+        popl    %esi
+        popl    %edi
+        ret
+
+
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul1.S b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul1.S
index 2e32460..3601d96 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul1.S
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul1.S
@@ -1,89 +1,89 @@
-/* i80586 mul_1 -- Multiply a limb vector with a limb and store

- *                       the result in a second limb vector.

- *

- *      Copyright (C) 1992, 1994, 1996, 1998,

- *                    2001, 2002 Free Software Foundation, Inc.

- *

- * This file is part of Libgcrypt.

- *

- * Libgcrypt is free software; you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License as

- * published by the Free Software Foundation; either version 2.1 of

- * the License, or (at your option) any later version.

- *

- * Libgcrypt is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

- *

- * Note: This code is heavily based on the GNU MP Library.

- *       Actually it's the same code with only minor changes in the

- *       way the data is stored; this is to support the abstraction

- *       of an optional secure memory allocation which may be used

- *       to avoid revealing of sensitive data due to paging etc.

- */

-

-

-#include "sysdep.h"

-#include "asm-syntax.h"

-

-

-/*******************

- * mpi_limb_t

- * _gcry_mpih_mul_1( mpi_ptr_t res_ptr, (sp + 4)

- *                mpi_ptr_t s1_ptr,     (sp + 8)

- *                mpi_size_t s1_size,   (sp + 12)

- *                mpi_limb_t s2_limb)   (sp + 16)

- */

-

-#define res_ptr edi

-#define s1_ptr  esi

-#define size    ecx

-#define s2_limb ebp

-

-        TEXT

-        ALIGN (3)

-        GLOBL   C_SYMBOL_NAME(_gcry_mpih_mul_1)

-C_SYMBOL_NAME(_gcry_mpih_mul_1:)

-

-        INSN1(push,l    ,R(edi))

-        INSN1(push,l    ,R(esi))

-        INSN1(push,l    ,R(ebx))

-        INSN1(push,l    ,R(ebp))

-

-        INSN2(mov,l     ,R(res_ptr),MEM_DISP(esp,20))

-        INSN2(mov,l     ,R(s1_ptr),MEM_DISP(esp,24))

-        INSN2(mov,l     ,R(size),MEM_DISP(esp,28))

-        INSN2(mov,l     ,R(s2_limb),MEM_DISP(esp,32))

-

-        INSN2(lea,l     ,R(res_ptr),MEM_INDEX(res_ptr,size,4))

-        INSN2(lea,l     ,R(s1_ptr),MEM_INDEX(s1_ptr,size,4))

-        INSN1(neg,l     ,R(size))

-        INSN2(xor,l     ,R(ebx),R(ebx))

-        ALIGN (3)

-

-Loop:   INSN2(adc,l     ,R(ebx),$0)

-        INSN2(mov,l     ,R(eax),MEM_INDEX(s1_ptr,size,4))

-

-        INSN1(mul,l     ,R(s2_limb))

-

-        INSN2(add,l     ,R(ebx),R(eax))

-

-        INSN2(mov,l     ,MEM_INDEX(res_ptr,size,4),R(ebx))

-        INSN1(inc,l     ,R(size))

-

-        INSN2(mov,l     ,R(ebx),R(edx))

-        INSN1(jnz,      ,Loop)

-

-        INSN2(adc,l     ,R(ebx),$0)

-        INSN2(mov,l     ,R(eax),R(ebx))

-        INSN1(pop,l     ,R(ebp))

-        INSN1(pop,l     ,R(ebx))

-        INSN1(pop,l     ,R(esi))

-        INSN1(pop,l     ,R(edi))

-        ret

-

+/* i80586 mul_1 -- Multiply a limb vector with a limb and store
+ *                       the result in a second limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1996, 1998,
+ *                    2001, 2002 Free Software Foundation, Inc.
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * Libgcrypt is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *       Actually it's the same code with only minor changes in the
+ *       way the data is stored; this is to support the abstraction
+ *       of an optional secure memory allocation which may be used
+ *       to avoid revealing of sensitive data due to paging etc.
+ */
+
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+
+/*******************
+ * mpi_limb_t
+ * _gcry_mpih_mul_1( mpi_ptr_t res_ptr, (sp + 4)
+ *                mpi_ptr_t s1_ptr,     (sp + 8)
+ *                mpi_size_t s1_size,   (sp + 12)
+ *                mpi_limb_t s2_limb)   (sp + 16)
+ */
+
+#define res_ptr edi
+#define s1_ptr  esi
+#define size    ecx
+#define s2_limb ebp
+
+        TEXT
+        ALIGN (3)
+        GLOBL   C_SYMBOL_NAME(_gcry_mpih_mul_1)
+C_SYMBOL_NAME(_gcry_mpih_mul_1:)
+
+        INSN1(push,l    ,R(edi))
+        INSN1(push,l    ,R(esi))
+        INSN1(push,l    ,R(ebx))
+        INSN1(push,l    ,R(ebp))
+
+        INSN2(mov,l     ,R(res_ptr),MEM_DISP(esp,20))
+        INSN2(mov,l     ,R(s1_ptr),MEM_DISP(esp,24))
+        INSN2(mov,l     ,R(size),MEM_DISP(esp,28))
+        INSN2(mov,l     ,R(s2_limb),MEM_DISP(esp,32))
+
+        INSN2(lea,l     ,R(res_ptr),MEM_INDEX(res_ptr,size,4))
+        INSN2(lea,l     ,R(s1_ptr),MEM_INDEX(s1_ptr,size,4))
+        INSN1(neg,l     ,R(size))
+        INSN2(xor,l     ,R(ebx),R(ebx))
+        ALIGN (3)
+
+Loop:   INSN2(adc,l     ,R(ebx),$0)
+        INSN2(mov,l     ,R(eax),MEM_INDEX(s1_ptr,size,4))
+
+        INSN1(mul,l     ,R(s2_limb))
+
+        INSN2(add,l     ,R(ebx),R(eax))
+
+        INSN2(mov,l     ,MEM_INDEX(res_ptr,size,4),R(ebx))
+        INSN1(inc,l     ,R(size))
+
+        INSN2(mov,l     ,R(ebx),R(edx))
+        INSN1(jnz,      ,Loop)
+
+        INSN2(adc,l     ,R(ebx),$0)
+        INSN2(mov,l     ,R(eax),R(ebx))
+        INSN1(pop,l     ,R(ebp))
+        INSN1(pop,l     ,R(ebx))
+        INSN1(pop,l     ,R(esi))
+        INSN1(pop,l     ,R(edi))
+        ret
+
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul2.S b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul2.S
index 47b0ec4..f32d363 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul2.S
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul2.S
@@ -1,93 +1,93 @@
-/* i80586 addmul_1 -- Multiply a limb vector with a limb and add

- *                    the result to a second limb vector.

- *

- *      Copyright (C) 1992, 1994, 1998, 

- *                    2001, 2002 Free Software Foundation, Inc.

- *

- * This file is part of Libgcrypt.

- *

- * Libgcrypt is free software; you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License as

- * published by the Free Software Foundation; either version 2.1 of

- * the License, or (at your option) any later version.

- *

- * Libgcrypt is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

- *

- * Note: This code is heavily based on the GNU MP Library.

- *       Actually it's the same code with only minor changes in the

- *       way the data is stored; this is to support the abstraction

- *       of an optional secure memory allocation which may be used

- *       to avoid revealing of sensitive data due to paging etc.

- */

-

-

-#include "sysdep.h"

-#include "asm-syntax.h"

-

-

-/*******************

- * mpi_limb_t

- * _gcry_mpih_addmul_1( mpi_ptr_t res_ptr,      (sp + 4)

- *                   mpi_ptr_t s1_ptr,       (sp + 8)

- *                   mpi_size_t s1_size,     (sp + 12)

- *                   mpi_limb_t s2_limb)     (sp + 16)

- */

-

-#define res_ptr edi

-#define s1_ptr  esi

-#define size    ecx

-#define s2_limb ebp

-

-        TEXT

-        ALIGN (3)

-        GLOBL   C_SYMBOL_NAME(_gcry_mpih_addmul_1)

-C_SYMBOL_NAME(_gcry_mpih_addmul_1:)

-

-        INSN1(push,l    ,R(edi))

-        INSN1(push,l    ,R(esi))

-        INSN1(push,l    ,R(ebx))

-        INSN1(push,l    ,R(ebp))

-

-        INSN2(mov,l     ,R(res_ptr),MEM_DISP(esp,20))

-        INSN2(mov,l     ,R(s1_ptr),MEM_DISP(esp,24))

-        INSN2(mov,l     ,R(size),MEM_DISP(esp,28))

-        INSN2(mov,l     ,R(s2_limb),MEM_DISP(esp,32))

-

-        INSN2(lea,l     ,R(res_ptr),MEM_INDEX(res_ptr,size,4))

-        INSN2(lea,l     ,R(s1_ptr),MEM_INDEX(s1_ptr,size,4))

-        INSN1(neg,l     ,R(size))

-        INSN2(xor,l     ,R(ebx),R(ebx))

-        ALIGN (3)

-

-Loop:   INSN2(adc,l     ,R(ebx),$0)

-        INSN2(mov,l     ,R(eax),MEM_INDEX(s1_ptr,size,4))

-

-        INSN1(mul,l     ,R(s2_limb))

-

-        INSN2(add,l     ,R(eax),R(ebx))

-        INSN2(mov,l     ,R(ebx),MEM_INDEX(res_ptr,size,4))

-

-        INSN2(adc,l     ,R(edx),$0)

-        INSN2(add,l     ,R(ebx),R(eax))

-

-        INSN2(mov,l     ,MEM_INDEX(res_ptr,size,4),R(ebx))

-        INSN1(inc,l     ,R(size))

-

-        INSN2(mov,l     ,R(ebx),R(edx))

-        INSN1(jnz,      ,Loop)

-

-        INSN2(adc,l     ,R(ebx),$0)

-        INSN2(mov,l     ,R(eax),R(ebx))

-        INSN1(pop,l     ,R(ebp))

-        INSN1(pop,l     ,R(ebx))

-        INSN1(pop,l     ,R(esi))

-        INSN1(pop,l     ,R(edi))

-        ret

-

+/* i80586 addmul_1 -- Multiply a limb vector with a limb and add
+ *                    the result to a second limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    2001, 2002 Free Software Foundation, Inc.
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * Libgcrypt is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *       Actually it's the same code with only minor changes in the
+ *       way the data is stored; this is to support the abstraction
+ *       of an optional secure memory allocation which may be used
+ *       to avoid revealing of sensitive data due to paging etc.
+ */
+
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+
+/*******************
+ * mpi_limb_t
+ * _gcry_mpih_addmul_1( mpi_ptr_t res_ptr,      (sp + 4)
+ *                   mpi_ptr_t s1_ptr,       (sp + 8)
+ *                   mpi_size_t s1_size,     (sp + 12)
+ *                   mpi_limb_t s2_limb)     (sp + 16)
+ */
+
+#define res_ptr edi
+#define s1_ptr  esi
+#define size    ecx
+#define s2_limb ebp
+
+        TEXT
+        ALIGN (3)
+        GLOBL   C_SYMBOL_NAME(_gcry_mpih_addmul_1)
+C_SYMBOL_NAME(_gcry_mpih_addmul_1:)
+
+        INSN1(push,l    ,R(edi))
+        INSN1(push,l    ,R(esi))
+        INSN1(push,l    ,R(ebx))
+        INSN1(push,l    ,R(ebp))
+
+        INSN2(mov,l     ,R(res_ptr),MEM_DISP(esp,20))
+        INSN2(mov,l     ,R(s1_ptr),MEM_DISP(esp,24))
+        INSN2(mov,l     ,R(size),MEM_DISP(esp,28))
+        INSN2(mov,l     ,R(s2_limb),MEM_DISP(esp,32))
+
+        INSN2(lea,l     ,R(res_ptr),MEM_INDEX(res_ptr,size,4))
+        INSN2(lea,l     ,R(s1_ptr),MEM_INDEX(s1_ptr,size,4))
+        INSN1(neg,l     ,R(size))
+        INSN2(xor,l     ,R(ebx),R(ebx))
+        ALIGN (3)
+
+Loop:   INSN2(adc,l     ,R(ebx),$0)
+        INSN2(mov,l     ,R(eax),MEM_INDEX(s1_ptr,size,4))
+
+        INSN1(mul,l     ,R(s2_limb))
+
+        INSN2(add,l     ,R(eax),R(ebx))
+        INSN2(mov,l     ,R(ebx),MEM_INDEX(res_ptr,size,4))
+
+        INSN2(adc,l     ,R(edx),$0)
+        INSN2(add,l     ,R(ebx),R(eax))
+
+        INSN2(mov,l     ,MEM_INDEX(res_ptr,size,4),R(ebx))
+        INSN1(inc,l     ,R(size))
+
+        INSN2(mov,l     ,R(ebx),R(edx))
+        INSN1(jnz,      ,Loop)
+
+        INSN2(adc,l     ,R(ebx),$0)
+        INSN2(mov,l     ,R(eax),R(ebx))
+        INSN1(pop,l     ,R(ebp))
+        INSN1(pop,l     ,R(ebx))
+        INSN1(pop,l     ,R(esi))
+        INSN1(pop,l     ,R(edi))
+        ret
+
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul3.S b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul3.S
index 4c1bd83..fa27d4e 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul3.S
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-mul3.S
@@ -1,93 +1,93 @@
-/* i80586 submul_1 -- Multiply a limb vector with a limb and add

- *                    the result to a second limb vector.

- *

- *      Copyright (C) 1992, 1994, 1998,

- *                    2001, 2002 Free Software Foundation, Inc.

- *

- * This file is part of Libgcrypt.

- *

- * Libgcrypt is free software; you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License as

- * published by the Free Software Foundation; either version 2.1 of

- * the License, or (at your option) any later version.

- *

- * Libgcrypt is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

- *

- * Note: This code is heavily based on the GNU MP Library.

- *       Actually it's the same code with only minor changes in the

- *       way the data is stored; this is to support the abstraction

- *       of an optional secure memory allocation which may be used

- *       to avoid revealing of sensitive data due to paging etc.

- */

-

-

-#include "sysdep.h"

-#include "asm-syntax.h"

-

-

-/*******************

- * mpi_limb_t

- * _gcry_mpih_submul_1( mpi_ptr_t res_ptr,      (sp + 4)

- *                   mpi_ptr_t s1_ptr,       (sp + 8)

- *                   mpi_size_t s1_size,     (sp + 12)

- *                   mpi_limb_t s2_limb)     (sp + 16)

- */

-

-#define res_ptr edi

-#define s1_ptr  esi

-#define size    ecx

-#define s2_limb ebp

-

-        TEXT

-        ALIGN (3)

-        GLOBL   C_SYMBOL_NAME(_gcry_mpih_submul_1)

-C_SYMBOL_NAME(_gcry_mpih_submul_1:)

-

-        INSN1(push,l    ,R(edi))

-        INSN1(push,l    ,R(esi))

-        INSN1(push,l    ,R(ebx))

-        INSN1(push,l    ,R(ebp))

-

-        INSN2(mov,l     ,R(res_ptr),MEM_DISP(esp,20))

-        INSN2(mov,l     ,R(s1_ptr),MEM_DISP(esp,24))

-        INSN2(mov,l     ,R(size),MEM_DISP(esp,28))

-        INSN2(mov,l     ,R(s2_limb),MEM_DISP(esp,32))

-

-        INSN2(lea,l     ,R(res_ptr),MEM_INDEX(res_ptr,size,4))

-        INSN2(lea,l     ,R(s1_ptr),MEM_INDEX(s1_ptr,size,4))

-        INSN1(neg,l     ,R(size))

-        INSN2(xor,l     ,R(ebx),R(ebx))

-        ALIGN (3)

-

-Loop:   INSN2(adc,l     ,R(ebx),$0)

-        INSN2(mov,l     ,R(eax),MEM_INDEX(s1_ptr,size,4))

-

-        INSN1(mul,l     ,R(s2_limb))

-

-        INSN2(add,l     ,R(eax),R(ebx))

-        INSN2(mov,l     ,R(ebx),MEM_INDEX(res_ptr,size,4))

-

-        INSN2(adc,l     ,R(edx),$0)

-        INSN2(sub,l     ,R(ebx),R(eax))

-

-        INSN2(mov,l     ,MEM_INDEX(res_ptr,size,4),R(ebx))

-        INSN1(inc,l     ,R(size))

-

-        INSN2(mov,l     ,R(ebx),R(edx))

-        INSN1(jnz,      ,Loop)

-

-        INSN2(adc,l     ,R(ebx),$0)

-        INSN2(mov,l     ,R(eax),R(ebx))

-        INSN1(pop,l     ,R(ebp))

-        INSN1(pop,l     ,R(ebx))

-        INSN1(pop,l     ,R(esi))

-        INSN1(pop,l     ,R(edi))

-        ret

-

+/* i80586 submul_1 -- Multiply a limb vector with a limb and add
+ *                    the result to a second limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001, 2002 Free Software Foundation, Inc.
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * Libgcrypt is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *       Actually it's the same code with only minor changes in the
+ *       way the data is stored; this is to support the abstraction
+ *       of an optional secure memory allocation which may be used
+ *       to avoid revealing of sensitive data due to paging etc.
+ */
+
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+
+/*******************
+ * mpi_limb_t
+ * _gcry_mpih_submul_1( mpi_ptr_t res_ptr,      (sp + 4)
+ *                   mpi_ptr_t s1_ptr,       (sp + 8)
+ *                   mpi_size_t s1_size,     (sp + 12)
+ *                   mpi_limb_t s2_limb)     (sp + 16)
+ */
+
+#define res_ptr edi
+#define s1_ptr  esi
+#define size    ecx
+#define s2_limb ebp
+
+        TEXT
+        ALIGN (3)
+        GLOBL   C_SYMBOL_NAME(_gcry_mpih_submul_1)
+C_SYMBOL_NAME(_gcry_mpih_submul_1:)
+
+        INSN1(push,l    ,R(edi))
+        INSN1(push,l    ,R(esi))
+        INSN1(push,l    ,R(ebx))
+        INSN1(push,l    ,R(ebp))
+
+        INSN2(mov,l     ,R(res_ptr),MEM_DISP(esp,20))
+        INSN2(mov,l     ,R(s1_ptr),MEM_DISP(esp,24))
+        INSN2(mov,l     ,R(size),MEM_DISP(esp,28))
+        INSN2(mov,l     ,R(s2_limb),MEM_DISP(esp,32))
+
+        INSN2(lea,l     ,R(res_ptr),MEM_INDEX(res_ptr,size,4))
+        INSN2(lea,l     ,R(s1_ptr),MEM_INDEX(s1_ptr,size,4))
+        INSN1(neg,l     ,R(size))
+        INSN2(xor,l     ,R(ebx),R(ebx))
+        ALIGN (3)
+
+Loop:   INSN2(adc,l     ,R(ebx),$0)
+        INSN2(mov,l     ,R(eax),MEM_INDEX(s1_ptr,size,4))
+
+        INSN1(mul,l     ,R(s2_limb))
+
+        INSN2(add,l     ,R(eax),R(ebx))
+        INSN2(mov,l     ,R(ebx),MEM_INDEX(res_ptr,size,4))
+
+        INSN2(adc,l     ,R(edx),$0)
+        INSN2(sub,l     ,R(ebx),R(eax))
+
+        INSN2(mov,l     ,MEM_INDEX(res_ptr,size,4),R(ebx))
+        INSN1(inc,l     ,R(size))
+
+        INSN2(mov,l     ,R(ebx),R(edx))
+        INSN1(jnz,      ,Loop)
+
+        INSN2(adc,l     ,R(ebx),$0)
+        INSN2(mov,l     ,R(eax),R(ebx))
+        INSN1(pop,l     ,R(ebp))
+        INSN1(pop,l     ,R(ebx))
+        INSN1(pop,l     ,R(esi))
+        INSN1(pop,l     ,R(edi))
+        ret
+
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-rshift.S b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-rshift.S
index fec2025..c661e3d 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-rshift.S
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-rshift.S
@@ -1,228 +1,228 @@
-/* i80586   rshift

- *

- *      Copyright (C) 1992, 1994, 1998,

- *                    2001, 2002 Free Software Foundation, Inc.

- *

- * This file is part of Libgcrypt.

- *

- * Libgcrypt is free software; you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License as

- * published by the Free Software Foundation; either version 2.1 of

- * the License, or (at your option) any later version.

- *

- * Libgcrypt is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

- *

- * Note: This code is heavily based on the GNU MP Library.

- *       Actually it's the same code with only minor changes in the

- *       way the data is stored; this is to support the abstraction

- *       of an optional secure memory allocation which may be used

- *       to avoid revealing of sensitive data due to paging etc.

- */

-

-

-#include "sysdep.h"

-#include "asm-syntax.h"

-

-

-

-/*******************

- * mpi_limb_t

- * _gcry_mpih_rshift( mpi_ptr_t wp,     (sp + 4)

- *                 mpi_ptr_t up,        (sp + 8)

- *                 mpi_size_t usize,    (sp + 12)

- *                 unsigned cnt)        (sp + 16)

- */

-

-.text

-        ALIGN (3)

-        .globl C_SYMBOL_NAME(_gcry_mpih_rshift)

-C_SYMBOL_NAME(_gcry_mpih_rshift:)

-        pushl   %edi

-        pushl   %esi

-        pushl   %ebx

-        pushl   %ebp

-

-        movl    20(%esp),%edi           /* res_ptr */

-        movl    24(%esp),%esi           /* s_ptr */

-        movl    28(%esp),%ebp           /* size */

-        movl    32(%esp),%ecx           /* cnt */

-

-/* We can use faster code for shift-by-1 under certain conditions.  */

-        cmp     $1,%ecx

-        jne     Rnormal

-        leal    4(%edi),%eax

-        cmpl    %esi,%eax

-        jnc     Rspecial                /* jump if res_ptr + 1 >= s_ptr */

-        leal    (%edi,%ebp,4),%eax

-        cmpl    %eax,%esi

-        jnc     Rspecial                /* jump if s_ptr >= res_ptr + size */

-

-Rnormal:

-        movl    (%esi),%edx

-        addl    $4,%esi

-        xorl    %eax,%eax

-        shrdl   %cl,%edx,%eax           /* compute carry limb */

-        pushl   %eax                    /* push carry limb onto stack */

-

-        decl    %ebp

-        pushl   %ebp

-        shrl    $3,%ebp

-        jz      Rend

-

-        movl    (%edi),%eax             /* fetch destination cache line */

-

-        ALIGN   (2)

-Roop:   movl    28(%edi),%eax           /* fetch destination cache line */

-        movl    %edx,%ebx

-

-        movl    (%esi),%eax

-        movl    4(%esi),%edx

-        shrdl   %cl,%eax,%ebx

-        shrdl   %cl,%edx,%eax

-        movl    %ebx,(%edi)

-        movl    %eax,4(%edi)

-

-        movl    8(%esi),%ebx

-        movl    12(%esi),%eax

-        shrdl   %cl,%ebx,%edx

-        shrdl   %cl,%eax,%ebx

-        movl    %edx,8(%edi)

-        movl    %ebx,12(%edi)

-

-        movl    16(%esi),%edx

-        movl    20(%esi),%ebx

-        shrdl   %cl,%edx,%eax

-        shrdl   %cl,%ebx,%edx

-        movl    %eax,16(%edi)

-        movl    %edx,20(%edi)

-

-        movl    24(%esi),%eax

-        movl    28(%esi),%edx

-        shrdl   %cl,%eax,%ebx

-        shrdl   %cl,%edx,%eax

-        movl    %ebx,24(%edi)

-        movl    %eax,28(%edi)

-

-        addl    $32,%esi

-        addl    $32,%edi

-        decl    %ebp

-        jnz     Roop

-

-Rend:   popl    %ebp

-        andl    $7,%ebp

-        jz      Rend2

-Roop2:  movl    (%esi),%eax

-        shrdl   %cl,%eax,%edx           /* compute result limb */

-        movl    %edx,(%edi)

-        movl    %eax,%edx

-        addl    $4,%esi

-        addl    $4,%edi

-        decl    %ebp

-        jnz     Roop2

-

-Rend2:  shrl    %cl,%edx                /* compute most significant limb */

-        movl    %edx,(%edi)             /* store it */

-

-        popl    %eax                    /* pop carry limb */

-

-        popl    %ebp

-        popl    %ebx

-        popl    %esi

-        popl    %edi

-        ret

-

-/* We loop from least significant end of the arrays, which is only

-   permissable if the source and destination don't overlap, since the

-   function is documented to work for overlapping source and destination.

-*/

-

-Rspecial:

-        leal    -4(%edi,%ebp,4),%edi

-        leal    -4(%esi,%ebp,4),%esi

-

-        movl    (%esi),%edx

-        subl    $4,%esi

-

-        decl    %ebp

-        pushl   %ebp

-        shrl    $3,%ebp

-

-        shrl    $1,%edx

-        incl    %ebp

-        decl    %ebp

-        jz      RLend

-

-        movl    (%edi),%eax             /* fetch destination cache line */

-

-        ALIGN   (2)

-RLoop:  movl    -28(%edi),%eax          /* fetch destination cache line */

-        movl    %edx,%ebx

-

-        movl    (%esi),%eax

-        movl    -4(%esi),%edx

-        rcrl    $1,%eax

-        movl    %ebx,(%edi)

-        rcrl    $1,%edx

-        movl    %eax,-4(%edi)

-

-        movl    -8(%esi),%ebx

-        movl    -12(%esi),%eax

-        rcrl    $1,%ebx

-        movl    %edx,-8(%edi)

-        rcrl    $1,%eax

-        movl    %ebx,-12(%edi)

-

-        movl    -16(%esi),%edx

-        movl    -20(%esi),%ebx

-        rcrl    $1,%edx

-        movl    %eax,-16(%edi)

-        rcrl    $1,%ebx

-        movl    %edx,-20(%edi)

-

-        movl    -24(%esi),%eax

-        movl    -28(%esi),%edx

-        rcrl    $1,%eax

-        movl    %ebx,-24(%edi)

-        rcrl    $1,%edx

-        movl    %eax,-28(%edi)

-

-        leal    -32(%esi),%esi          /* use leal not to clobber carry */

-        leal    -32(%edi),%edi

-        decl    %ebp

-        jnz     RLoop

-

-RLend:  popl    %ebp

-        sbbl    %eax,%eax               /* save carry in %eax */

-        andl    $7,%ebp

-        jz      RLend2

-        addl    %eax,%eax               /* restore carry from eax */

-RLoop2: movl    %edx,%ebx

-        movl    (%esi),%edx

-        rcrl    $1,%edx

-        movl    %ebx,(%edi)

-

-        leal    -4(%esi),%esi           /* use leal not to clobber carry */

-        leal    -4(%edi),%edi

-        decl    %ebp

-        jnz     RLoop2

-

-        jmp     RL1

-RLend2: addl    %eax,%eax               /* restore carry from eax */

-RL1:    movl    %edx,(%edi)             /* store last limb */

-

-        movl    $0,%eax

-        rcrl    $1,%eax

-

-        popl    %ebp

-        popl    %ebx

-        popl    %esi

-        popl    %edi

-        ret

-

+/* i80586   rshift
+ *
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001, 2002 Free Software Foundation, Inc.
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * Libgcrypt is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *       Actually it's the same code with only minor changes in the
+ *       way the data is stored; this is to support the abstraction
+ *       of an optional secure memory allocation which may be used
+ *       to avoid revealing of sensitive data due to paging etc.
+ */
+
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+
+
+/*******************
+ * mpi_limb_t
+ * _gcry_mpih_rshift( mpi_ptr_t wp,     (sp + 4)
+ *                 mpi_ptr_t up,        (sp + 8)
+ *                 mpi_size_t usize,    (sp + 12)
+ *                 unsigned cnt)        (sp + 16)
+ */
+
+.text
+        ALIGN (3)
+        .globl C_SYMBOL_NAME(_gcry_mpih_rshift)
+C_SYMBOL_NAME(_gcry_mpih_rshift:)
+        pushl   %edi
+        pushl   %esi
+        pushl   %ebx
+        pushl   %ebp
+
+        movl    20(%esp),%edi           /* res_ptr */
+        movl    24(%esp),%esi           /* s_ptr */
+        movl    28(%esp),%ebp           /* size */
+        movl    32(%esp),%ecx           /* cnt */
+
+/* We can use faster code for shift-by-1 under certain conditions.  */
+        cmp     $1,%ecx
+        jne     Rnormal
+        leal    4(%edi),%eax
+        cmpl    %esi,%eax
+        jnc     Rspecial                /* jump if res_ptr + 1 >= s_ptr */
+        leal    (%edi,%ebp,4),%eax
+        cmpl    %eax,%esi
+        jnc     Rspecial                /* jump if s_ptr >= res_ptr + size */
+
+Rnormal:
+        movl    (%esi),%edx
+        addl    $4,%esi
+        xorl    %eax,%eax
+        shrdl   %cl,%edx,%eax           /* compute carry limb */
+        pushl   %eax                    /* push carry limb onto stack */
+
+        decl    %ebp
+        pushl   %ebp
+        shrl    $3,%ebp
+        jz      Rend
+
+        movl    (%edi),%eax             /* fetch destination cache line */
+
+        ALIGN   (2)
+Roop:   movl    28(%edi),%eax           /* fetch destination cache line */
+        movl    %edx,%ebx
+
+        movl    (%esi),%eax
+        movl    4(%esi),%edx
+        shrdl   %cl,%eax,%ebx
+        shrdl   %cl,%edx,%eax
+        movl    %ebx,(%edi)
+        movl    %eax,4(%edi)
+
+        movl    8(%esi),%ebx
+        movl    12(%esi),%eax
+        shrdl   %cl,%ebx,%edx
+        shrdl   %cl,%eax,%ebx
+        movl    %edx,8(%edi)
+        movl    %ebx,12(%edi)
+
+        movl    16(%esi),%edx
+        movl    20(%esi),%ebx
+        shrdl   %cl,%edx,%eax
+        shrdl   %cl,%ebx,%edx
+        movl    %eax,16(%edi)
+        movl    %edx,20(%edi)
+
+        movl    24(%esi),%eax
+        movl    28(%esi),%edx
+        shrdl   %cl,%eax,%ebx
+        shrdl   %cl,%edx,%eax
+        movl    %ebx,24(%edi)
+        movl    %eax,28(%edi)
+
+        addl    $32,%esi
+        addl    $32,%edi
+        decl    %ebp
+        jnz     Roop
+
+Rend:   popl    %ebp
+        andl    $7,%ebp
+        jz      Rend2
+Roop2:  movl    (%esi),%eax
+        shrdl   %cl,%eax,%edx           /* compute result limb */
+        movl    %edx,(%edi)
+        movl    %eax,%edx
+        addl    $4,%esi
+        addl    $4,%edi
+        decl    %ebp
+        jnz     Roop2
+
+Rend2:  shrl    %cl,%edx                /* compute most significant limb */
+        movl    %edx,(%edi)             /* store it */
+
+        popl    %eax                    /* pop carry limb */
+
+        popl    %ebp
+        popl    %ebx
+        popl    %esi
+        popl    %edi
+        ret
+
+/* We loop from least significant end of the arrays, which is only
+   permissable if the source and destination don't overlap, since the
+   function is documented to work for overlapping source and destination.
+*/
+
+Rspecial:
+        leal    -4(%edi,%ebp,4),%edi
+        leal    -4(%esi,%ebp,4),%esi
+
+        movl    (%esi),%edx
+        subl    $4,%esi
+
+        decl    %ebp
+        pushl   %ebp
+        shrl    $3,%ebp
+
+        shrl    $1,%edx
+        incl    %ebp
+        decl    %ebp
+        jz      RLend
+
+        movl    (%edi),%eax             /* fetch destination cache line */
+
+        ALIGN   (2)
+RLoop:  movl    -28(%edi),%eax          /* fetch destination cache line */
+        movl    %edx,%ebx
+
+        movl    (%esi),%eax
+        movl    -4(%esi),%edx
+        rcrl    $1,%eax
+        movl    %ebx,(%edi)
+        rcrl    $1,%edx
+        movl    %eax,-4(%edi)
+
+        movl    -8(%esi),%ebx
+        movl    -12(%esi),%eax
+        rcrl    $1,%ebx
+        movl    %edx,-8(%edi)
+        rcrl    $1,%eax
+        movl    %ebx,-12(%edi)
+
+        movl    -16(%esi),%edx
+        movl    -20(%esi),%ebx
+        rcrl    $1,%edx
+        movl    %eax,-16(%edi)
+        rcrl    $1,%ebx
+        movl    %edx,-20(%edi)
+
+        movl    -24(%esi),%eax
+        movl    -28(%esi),%edx
+        rcrl    $1,%eax
+        movl    %ebx,-24(%edi)
+        rcrl    $1,%edx
+        movl    %eax,-28(%edi)
+
+        leal    -32(%esi),%esi          /* use leal not to clobber carry */
+        leal    -32(%edi),%edi
+        decl    %ebp
+        jnz     RLoop
+
+RLend:  popl    %ebp
+        sbbl    %eax,%eax               /* save carry in %eax */
+        andl    $7,%ebp
+        jz      RLend2
+        addl    %eax,%eax               /* restore carry from eax */
+RLoop2: movl    %edx,%ebx
+        movl    (%esi),%edx
+        rcrl    $1,%edx
+        movl    %ebx,(%edi)
+
+        leal    -4(%esi),%esi           /* use leal not to clobber carry */
+        leal    -4(%edi),%edi
+        decl    %ebp
+        jnz     RLoop2
+
+        jmp     RL1
+RLend2: addl    %eax,%eax               /* restore carry from eax */
+RL1:    movl    %edx,(%edi)             /* store last limb */
+
+        movl    $0,%eax
+        rcrl    $1,%eax
+
+        popl    %ebp
+        popl    %ebx
+        popl    %esi
+        popl    %edi
+        ret
+
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-sub1.S b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-sub1.S
index 4197428..ef2d580 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-sub1.S
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/i586/mpih-sub1.S
@@ -1,142 +1,142 @@
-/* i80586 sub_n -- Sub two limb vectors of the same length > 0 and store

- *                 sum in a third limb vector.

- *

- *      Copyright (C) 1992, 1994, 1995, 1998, 

- *                    2001, 2002 Free Software Foundation, Inc.

- *

- * This file is part of Libgcrypt.

- *

- * Libgcrypt is free software; you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License as

- * published by the Free Software Foundation; either version 2.1 of

- * the License, or (at your option) any later version.

- *

- * Libgcrypt is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

- *

- * Note: This code is heavily based on the GNU MP Library.

- *       Actually it's the same code with only minor changes in the

- *       way the data is stored; this is to support the abstraction

- *       of an optional secure memory allocation which may be used

- *       to avoid revealing of sensitive data due to paging etc.

- */

-

-

-#include "sysdep.h"

-#include "asm-syntax.h"

-

-

-/*******************

- *  mpi_limb_t

- *  _gcry_mpih_sub_n( mpi_ptr_t res_ptr,        (sp + 4)

- *                 mpi_ptr_t s1_ptr,    (sp + 8)

- *                 mpi_ptr_t s2_ptr,    (sp + 12)

- *                 mpi_size_t size)     (sp + 16)

- */

-

-

-.text

-        ALIGN (3)

-        .globl C_SYMBOL_NAME(_gcry_mpih_sub_n)

-C_SYMBOL_NAME(_gcry_mpih_sub_n:)

-

-        pushl   %edi

-        pushl   %esi

-        pushl   %ebx

-        pushl   %ebp

-

-        movl    20(%esp),%edi           /* res_ptr */

-        movl    24(%esp),%esi           /* s1_ptr */

-        movl    28(%esp),%ebp           /* s2_ptr */

-        movl    32(%esp),%ecx           /* size */

-

-        movl    (%ebp),%ebx

-

-        decl    %ecx

-        movl    %ecx,%edx

-        shrl    $3,%ecx

-        andl    $7,%edx

-        testl   %ecx,%ecx               /* zero carry flag */

-        jz      Lend

-        pushl   %edx

-

-        ALIGN (3)

-Loop:   movl    28(%edi),%eax           /* fetch destination cache line */

-        leal    32(%edi),%edi

-

-L1:     movl    (%esi),%eax

-        movl    4(%esi),%edx

-        sbbl    %ebx,%eax

-        movl    4(%ebp),%ebx

-        sbbl    %ebx,%edx

-        movl    8(%ebp),%ebx

-        movl    %eax,-32(%edi)

-        movl    %edx,-28(%edi)

-

-L2:     movl    8(%esi),%eax

-        movl    12(%esi),%edx

-        sbbl    %ebx,%eax

-        movl    12(%ebp),%ebx

-        sbbl    %ebx,%edx

-        movl    16(%ebp),%ebx

-        movl    %eax,-24(%edi)

-        movl    %edx,-20(%edi)

-

-L3:     movl    16(%esi),%eax

-        movl    20(%esi),%edx

-        sbbl    %ebx,%eax

-        movl    20(%ebp),%ebx

-        sbbl    %ebx,%edx

-        movl    24(%ebp),%ebx

-        movl    %eax,-16(%edi)

-        movl    %edx,-12(%edi)

-

-L4:     movl    24(%esi),%eax

-        movl    28(%esi),%edx

-        sbbl    %ebx,%eax

-        movl    28(%ebp),%ebx

-        sbbl    %ebx,%edx

-        movl    32(%ebp),%ebx

-        movl    %eax,-8(%edi)

-        movl    %edx,-4(%edi)

-

-        leal    32(%esi),%esi

-        leal    32(%ebp),%ebp

-        decl    %ecx

-        jnz     Loop

-

-        popl    %edx

-Lend:

-        decl    %edx                    /* test %edx w/o clobbering carry */

-        js      Lend2

-        incl    %edx

-Loop2:

-        leal    4(%edi),%edi

-        movl    (%esi),%eax

-        sbbl    %ebx,%eax

-        movl    4(%ebp),%ebx

-        movl    %eax,-4(%edi)

-        leal    4(%esi),%esi

-        leal    4(%ebp),%ebp

-        decl    %edx

-        jnz     Loop2

-Lend2:

-        movl    (%esi),%eax

-        sbbl    %ebx,%eax

-        movl    %eax,(%edi)

-

-        sbbl    %eax,%eax

-        negl    %eax

-

-        popl    %ebp

-        popl    %ebx

-        popl    %esi

-        popl    %edi

-        ret

-

+/* i80586 sub_n -- Sub two limb vectors of the same length > 0 and store
+ *                 sum in a third limb vector.
+ *
+ *      Copyright (C) 1992, 1994, 1995, 1998, 
+ *                    2001, 2002 Free Software Foundation, Inc.
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * Libgcrypt is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ *       Actually it's the same code with only minor changes in the
+ *       way the data is stored; this is to support the abstraction
+ *       of an optional secure memory allocation which may be used
+ *       to avoid revealing of sensitive data due to paging etc.
+ */
+
+
+#include "sysdep.h"
+#include "asm-syntax.h"
+
+
+/*******************
+ *  mpi_limb_t
+ *  _gcry_mpih_sub_n( mpi_ptr_t res_ptr,        (sp + 4)
+ *                 mpi_ptr_t s1_ptr,    (sp + 8)
+ *                 mpi_ptr_t s2_ptr,    (sp + 12)
+ *                 mpi_size_t size)     (sp + 16)
+ */
+
+
+.text
+        ALIGN (3)
+        .globl C_SYMBOL_NAME(_gcry_mpih_sub_n)
+C_SYMBOL_NAME(_gcry_mpih_sub_n:)
+
+        pushl   %edi
+        pushl   %esi
+        pushl   %ebx
+        pushl   %ebp
+
+        movl    20(%esp),%edi           /* res_ptr */
+        movl    24(%esp),%esi           /* s1_ptr */
+        movl    28(%esp),%ebp           /* s2_ptr */
+        movl    32(%esp),%ecx           /* size */
+
+        movl    (%ebp),%ebx
+
+        decl    %ecx
+        movl    %ecx,%edx
+        shrl    $3,%ecx
+        andl    $7,%edx
+        testl   %ecx,%ecx               /* zero carry flag */
+        jz      Lend
+        pushl   %edx
+
+        ALIGN (3)
+Loop:   movl    28(%edi),%eax           /* fetch destination cache line */
+        leal    32(%edi),%edi
+
+L1:     movl    (%esi),%eax
+        movl    4(%esi),%edx
+        sbbl    %ebx,%eax
+        movl    4(%ebp),%ebx
+        sbbl    %ebx,%edx
+        movl    8(%ebp),%ebx
+        movl    %eax,-32(%edi)
+        movl    %edx,-28(%edi)
+
+L2:     movl    8(%esi),%eax
+        movl    12(%esi),%edx
+        sbbl    %ebx,%eax
+        movl    12(%ebp),%ebx
+        sbbl    %ebx,%edx
+        movl    16(%ebp),%ebx
+        movl    %eax,-24(%edi)
+        movl    %edx,-20(%edi)
+
+L3:     movl    16(%esi),%eax
+        movl    20(%esi),%edx
+        sbbl    %ebx,%eax
+        movl    20(%ebp),%ebx
+        sbbl    %ebx,%edx
+        movl    24(%ebp),%ebx
+        movl    %eax,-16(%edi)
+        movl    %edx,-12(%edi)
+
+L4:     movl    24(%esi),%eax
+        movl    28(%esi),%edx
+        sbbl    %ebx,%eax
+        movl    28(%ebp),%ebx
+        sbbl    %ebx,%edx
+        movl    32(%ebp),%ebx
+        movl    %eax,-8(%edi)
+        movl    %edx,-4(%edi)
+
+        leal    32(%esi),%esi
+        leal    32(%ebp),%ebp
+        decl    %ecx
+        jnz     Loop
+
+        popl    %edx
+Lend:
+        decl    %edx                    /* test %edx w/o clobbering carry */
+        js      Lend2
+        incl    %edx
+Loop2:
+        leal    4(%edi),%edi
+        movl    (%esi),%eax
+        sbbl    %ebx,%eax
+        movl    4(%ebp),%ebx
+        movl    %eax,-4(%edi)
+        leal    4(%esi),%esi
+        leal    4(%ebp),%ebp
+        decl    %edx
+        jnz     Loop2
+Lend2:
+        movl    (%esi),%eax
+        sbbl    %ebx,%eax
+        movl    %eax,(%edi)
+
+        sbbl    %eax,%eax
+        negl    %eax
+
+        popl    %ebp
+        popl    %ebx
+        popl    %esi
+        popl    %edi
+        ret
+