Thu Sep 15 09:32:32 2011 UTC ()
Remove CVS keywords from patch, so that distinfo has a chance of ever
being right.
XXX: this patch should be split up, it contains more than one file.


(wiz)
diff -r1.30 -r1.31 pkgsrc/security/heimdal/distinfo
diff -r1.1 -r1.2 pkgsrc/security/heimdal/patches/patch-lib_hcrypto_libtommath_tommath.h
cvs diff -r1.30 -r1.31 pkgsrc/security/heimdal/distinfo (expand / switch to unified diff)

--- pkgsrc/security/heimdal/distinfo 2011/09/14 17:33:00 1.30
+++ pkgsrc/security/heimdal/distinfo 2011/09/15 09:32:32 1.31
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.30 2011/09/14 17:33:00 hans Exp $ 1$NetBSD: distinfo,v 1.31 2011/09/15 09:32:32 wiz Exp $
2 2
3SHA1 (heimdal-1.4.tar.gz) = b4c876df3637a11deea72f87a6e54f6caf501679 3SHA1 (heimdal-1.4.tar.gz) = b4c876df3637a11deea72f87a6e54f6caf501679
4RMD160 (heimdal-1.4.tar.gz) = 055288f1ab37781f1533299bdff9b0d1e264d470 4RMD160 (heimdal-1.4.tar.gz) = 055288f1ab37781f1533299bdff9b0d1e264d470
5Size (heimdal-1.4.tar.gz) = 6095377 bytes 5Size (heimdal-1.4.tar.gz) = 6095377 bytes
6SHA1 (patch-ad) = 37c2a7cdc4dba695a84057b40aae3c5a971cb546 6SHA1 (patch-ad) = 37c2a7cdc4dba695a84057b40aae3c5a971cb546
7SHA1 (patch-al) = 022d5f3723bd1db7fe5e92eea5d0106851a5d424 7SHA1 (patch-al) = 022d5f3723bd1db7fe5e92eea5d0106851a5d424
8SHA1 (patch-ar) = 0a3e7bbd3cb04deb0f6772afd9a6b6b5353463d3 8SHA1 (patch-ar) = 0a3e7bbd3cb04deb0f6772afd9a6b6b5353463d3
9SHA1 (patch-kdc_version-script.map) = 42b0417a16b19a680f30ae34cfffd082f609d4a6 9SHA1 (patch-kdc_version-script.map) = 42b0417a16b19a680f30ae34cfffd082f609d4a6
10SHA1 (patch-lib_hcrypto_libtommath_tommath.h) = 5c3bc3fa18ce0b32377d782c7aa66985a2d3b6cd 10SHA1 (patch-lib_hcrypto_libtommath_tommath.h) = 42f9067dab75f1795e841a0858416aa1f903d192
11SHA1 (patch-lib_otp_Makefile.in) = 830f0e536a103478d147bb03e7752d5d38ddf03b 11SHA1 (patch-lib_otp_Makefile.in) = 830f0e536a103478d147bb03e7752d5d38ddf03b
cvs diff -r1.1 -r1.2 pkgsrc/security/heimdal/patches/Attic/patch-lib_hcrypto_libtommath_tommath.h (expand / switch to unified diff)

--- pkgsrc/security/heimdal/patches/Attic/patch-lib_hcrypto_libtommath_tommath.h 2011/09/14 17:33:00 1.1
+++ pkgsrc/security/heimdal/patches/Attic/patch-lib_hcrypto_libtommath_tommath.h 2011/09/15 09:32:32 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-lib_hcrypto_libtommath_tommath.h,v 1.1 2011/09/14 17:33:00 hans Exp $ 1$NetBSD: patch-lib_hcrypto_libtommath_tommath.h,v 1.2 2011/09/15 09:32:32 wiz Exp $
2 2
3--- /dev/null 1 Jan 1970 00:00:00 -0000 3--- /dev/null 1 Jan 1970 00:00:00 -0000
4+++ lib/hcrypto/libtommath/tommath.h 29 Oct 2010 01:14:54 -0000 4+++ lib/hcrypto/libtommath/tommath.h 29 Oct 2010 01:14:54 -0000
5@@ -0,0 +1,592 @@ 5@@ -0,0 +1,588 @@
6+/* LibTomMath, multiple-precision integer library -- Tom St Denis 6+/* LibTomMath, multiple-precision integer library -- Tom St Denis
7+ * 7+ *
8+ * LibTomMath is a library that provides multiple-precision 8+ * LibTomMath is a library that provides multiple-precision
9+ * integer arithmetic as well as number theoretic functionality. 9+ * integer arithmetic as well as number theoretic functionality.
10+ * 10+ *
11+ * The library was designed directly after the MPI library by 11+ * The library was designed directly after the MPI library by
12+ * Michael Fromberger but has been written from scratch with 12+ * Michael Fromberger but has been written from scratch with
13+ * additional optimizations in place. 13+ * additional optimizations in place.
14+ * 14+ *
15+ * The library is free for all purposes without any express 15+ * The library is free for all purposes without any express
16+ * guarantee it works. 16+ * guarantee it works.
17+ * 17+ *
18+ * Tom St Denis, tomstdenis@gmail.com, http://math.libtomcrypt.com 18+ * Tom St Denis, tomstdenis@gmail.com, http://math.libtomcrypt.com
@@ -583,28 +583,28 @@ $NetBSD: patch-lib_hcrypto_libtommath_to @@ -583,28 +583,28 @@ $NetBSD: patch-lib_hcrypto_libtommath_to
583+int s_mp_exptmod (mp_int * G, mp_int * X, mp_int * P, mp_int * Y, int mode); 583+int s_mp_exptmod (mp_int * G, mp_int * X, mp_int * P, mp_int * Y, int mode);
584+void bn_reverse(unsigned char *s, int len); 584+void bn_reverse(unsigned char *s, int len);
585+ 585+
586+extern const char *mp_s_rmap; 586+extern const char *mp_s_rmap;
587+ 587+
588+#ifdef __cplusplus 588+#ifdef __cplusplus
589+ } 589+ }
590+#endif 590+#endif
591+ 591+
592+#endif 592+#endif
593+ 593+
594+ 594+
595+/* $Source: /home/ryo/public_nerv/netbsd/pkgsrc/cvsroot/pkgsrc/security/heimdal/patches/Attic/patch-lib_hcrypto_libtommath_tommath.h,v $ */ 595+/* $Source: /home/ryo/public_nerv/netbsd/pkgsrc/cvsroot/pkgsrc/security/heimdal/patches/Attic/patch-lib_hcrypto_libtommath_tommath.h,v $ */
596+/* $Revision: 1.1 $ */ 596+/* $Revision: 1.2 $ */
597+/* $Date: 2011/09/14 17:33:00 $ */ 597+/* $Date: 2011/09/15 09:32:32 $ */
598--- /dev/null 1 Jan 1970 00:00:00 -0000 598--- /dev/null 1 Jan 1970 00:00:00 -0000
599+++ lib/hcrypto/libtommath/tommath_class.h 29 Oct 2010 01:14:54 -0000 599+++ lib/hcrypto/libtommath/tommath_class.h 29 Oct 2010 01:14:54 -0000
600@@ -0,0 +1,1000 @@ 600@@ -0,0 +1,1000 @@
601+#if !(defined(LTM1) && defined(LTM2) && defined(LTM3)) 601+#if !(defined(LTM1) && defined(LTM2) && defined(LTM3))
602+#if defined(LTM2) 602+#if defined(LTM2)
603+#define LTM3 603+#define LTM3
604+#endif 604+#endif
605+#if defined(LTM1) 605+#if defined(LTM1)
606+#define LTM2 606+#define LTM2
607+#endif 607+#endif
608+#define LTM1 608+#define LTM1
609+ 609+
610+#if defined(LTM_ALL) 610+#if defined(LTM_ALL)
@@ -1584,33 +1584,29 @@ $NetBSD: patch-lib_hcrypto_libtommath_to @@ -1584,33 +1584,29 @@ $NetBSD: patch-lib_hcrypto_libtommath_to
1584+#endif 1584+#endif
1585+ 1585+
1586+#if defined(BNCORE_C) 1586+#if defined(BNCORE_C)
1587+#endif 1587+#endif
1588+ 1588+
1589+#ifdef LTM3 1589+#ifdef LTM3
1590+#define LTM_LAST 1590+#define LTM_LAST
1591+#endif 1591+#endif
1592+#include <tommath_superclass.h> 1592+#include <tommath_superclass.h>
1593+#include <tommath_class.h> 1593+#include <tommath_class.h>
1594+#else 1594+#else
1595+#define LTM_LAST 1595+#define LTM_LAST
1596+#endif 1596+#endif
1597+ 
1598+/* $Source: /home/ryo/public_nerv/netbsd/pkgsrc/cvsroot/pkgsrc/security/heimdal/patches/Attic/patch-lib_hcrypto_libtommath_tommath.h,v $ */ 
1599+/* $Revision: 1.1 $ */ 
1600+/* $Date: 2011/09/14 17:33:00 $ */ 
1601--- /dev/null 1 Jan 1970 00:00:00 -0000 1597--- /dev/null 1 Jan 1970 00:00:00 -0000
1602+++ lib/hcrypto/libtommath/tommath_superclass.h 29 Oct 2010 01:14:54 -0000 1598+++ lib/hcrypto/libtommath/tommath_superclass.h 29 Oct 2010 01:14:54 -0000
1603@@ -0,0 +1,76 @@ 1599@@ -0,0 +1,72 @@
1604+/* super class file for PK algos */ 1600+/* super class file for PK algos */
1605+ 1601+
1606+/* default ... include all MPI */ 1602+/* default ... include all MPI */
1607+#define LTM_ALL 1603+#define LTM_ALL
1608+ 1604+
1609+/* RSA only (does not support DH/DSA/ECC) */ 1605+/* RSA only (does not support DH/DSA/ECC) */
1610+/* #define SC_RSA_1 */ 1606+/* #define SC_RSA_1 */
1611+ 1607+
1612+/* For reference.... On an Athlon64 optimizing for speed... 1608+/* For reference.... On an Athlon64 optimizing for speed...
1613+ 1609+
1614+ LTM's mpi.o with all functions [striped] is 142KiB in size. 1610+ LTM's mpi.o with all functions [striped] is 142KiB in size.
1615+ 1611+
1616+*/ 1612+*/
@@ -1663,17 +1659,13 @@ $NetBSD: patch-lib_hcrypto_libtommath_to @@ -1663,17 +1659,13 @@ $NetBSD: patch-lib_hcrypto_libtommath_to
1663+ #undef BN_FAST_MP_INVMOD_C 1659+ #undef BN_FAST_MP_INVMOD_C
1664+ 1660+
1665+ /* To safely undefine these you have to make sure your RSA key won't exceed the Comba threshold 1661+ /* To safely undefine these you have to make sure your RSA key won't exceed the Comba threshold
1666+ * which is roughly 255 digits [7140 bits for 32-bit machines, 15300 bits for 64-bit machines]  1662+ * which is roughly 255 digits [7140 bits for 32-bit machines, 15300 bits for 64-bit machines]
1667+ * which means roughly speaking you can handle upto 2536-bit RSA keys with these defined without 1663+ * which means roughly speaking you can handle upto 2536-bit RSA keys with these defined without
1668+ * trouble.  1664+ * trouble.
1669+ */ 1665+ */
1670+ #undef BN_S_MP_MUL_DIGS_C 1666+ #undef BN_S_MP_MUL_DIGS_C
1671+ #undef BN_S_MP_SQR_C 1667+ #undef BN_S_MP_SQR_C
1672+ #undef BN_MP_MONTGOMERY_REDUCE_C 1668+ #undef BN_MP_MONTGOMERY_REDUCE_C
1673+#endif 1669+#endif
1674+ 1670+
1675+#endif 1671+#endif
1676+ 
1677+/* $Source: /home/ryo/public_nerv/netbsd/pkgsrc/cvsroot/pkgsrc/security/heimdal/patches/Attic/patch-lib_hcrypto_libtommath_tommath.h,v $ */ 
1678+/* $Revision: 1.1 $ */ 
1679+/* $Date: 2011/09/14 17:33:00 $ */