Attachment #42379 for bug #66099

View | Details | Raw Unified | Return to bug 66099
Collapse All | Expand All

Lines 6-12 Link Here

(-)security/libtomcrypt/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= libtomcrypt	8	PORTNAME= libtomcrypt
9	PORTVERSION= 0.92	9	PORTVERSION= 0.94
10	CATEGORIES= security	10	CATEGORIES= security
11	MASTER_SITES= http://libtomcrypt.org/files/	11	MASTER_SITES= http://libtomcrypt.org/files/
12	DISTNAME= crypt-${PORTVERSION}	12	DISTNAME= crypt-${PORTVERSION}

Lines 1-2 Link Here

(-)security/libtomcrypt/distinfo (-2 / +2 lines)
1	MD5 (crypt-0.92.tar.bz2) = 12fd407c6678e072446323aaf41c0719	1	MD5 (crypt-0.94.tar.bz2) = f53f3977e74d63e4733e388bffc69087
2	SIZE (crypt-0.92.tar.bz2) = 783233	2	SIZE (crypt-0.94.tar.bz2) = 820131




--- dsa.c.orig	Tue Jan 13 14:52:15 2004
+++ dsa.c	Tue Jan 13 14:53:54 2004
@@ -297,15 +297,15 @@
    return err;
 }
 
-#define OUTPUT_BIGNUM(num, buf2, y, z)         \
-{                                              \
-      z = (unsigned long)mp_unsigned_bin_size(num);  \
-      if ((y + 4 + z) > *outlen) { return CRYPT_BUFFER_OVERFLOW; } \
-      STORE32L(z, out+y);                     \
-      y += 4;                                  \
-      if (mp_to_unsigned_bin(num, out+y) != MP_OKAY) { return CRYPT_MEM; }  \
-      y += z;                                  \
-}
+#define OUTPUT_BIGNUM(num, buf2, y, z)         \
+{                                              \
+      z = (unsigned long)mp_unsigned_bin_size(num);  \
+      if ((y + 4 + z) > *outlen) { return CRYPT_BUFFER_OVERFLOW; } \
+      STORE32L(z, out+y);                     \
+      y += 4;                                  \
+      if (mp_to_unsigned_bin(num, out+y) != MP_OKAY) { return CRYPT_MEM; }  \
+      y += z;                                  \
+}
 
 int dsa_export(unsigned char *out, unsigned long *outlen, int type, dsa_key *key)
 {
@@ -352,33 +352,33 @@
    return CRYPT_OK;
 }
 
-#define INPUT_BIGNUM(num, in, x, y)                              \
-{                                                                \
-     /* load value */                                            \
-     if (y+4 > inlen) {                                          \
-        err = CRYPT_INVALID_PACKET;                              \
-        goto error;                                              \
-     }                                                           \
-     LOAD32L(x, in+y);                                           \
-     y += 4;                                                     \
-                                                                 \
-     /* sanity check... */                                       \
-     if (y+x > inlen) {                                          \
-        err = CRYPT_INVALID_PACKET;                              \
-        goto error;                                              \
-     }                                                           \
-                                                                 \
-     /* load it */                                               \
-     if (mp_read_unsigned_bin(num, (unsigned char *)in+y, (int)x) != MP_OKAY) {\
-        err = CRYPT_MEM;                                         \
-        goto error;                                              \
-     }                                                           \
-     y += x;                                                     \
-     if (mp_shrink(num) != MP_OKAY) {                            \
-        err = CRYPT_MEM;                                         \
-        goto error;                                              \
-     }                                                           \
-}
+#define INPUT_BIGNUM(num, in, x, y)                              \
+{                                                                \
+     /* load value */                                            \
+     if (y+4 > inlen) {                                          \
+        err = CRYPT_INVALID_PACKET;                              \
+        goto error;                                              \
+     }                                                           \
+     LOAD32L(x, in+y);                                           \
+     y += 4;                                                     \
+                                                                 \
+     /* sanity check... */                                       \
+     if (y+x > inlen) {                                          \
+        err = CRYPT_INVALID_PACKET;                              \
+        goto error;                                              \
+     }                                                           \
+                                                                 \
+     /* load it */                                               \
+     if (mp_read_unsigned_bin(num, (unsigned char *)in+y, (int)x) != MP_OKAY) {\
+        err = CRYPT_MEM;                                         \
+        goto error;                                              \
+     }                                                           \
+     y += x;                                                     \
+     if (mp_shrink(num) != MP_OKAY) {                            \
+        err = CRYPT_MEM;                                         \
+        goto error;                                              \
+     }                                                           \
+}
 
 int dsa_import(const unsigned char *in, unsigned long inlen, dsa_key *key)
 {




%%EXAMPLESDIR%%/ch2-01.c
%%EXAMPLESDIR%%/encrypt.c
%%EXAMPLESDIR%%/small.c
%%EXAMPLESDIR%%/timer.asm
%%EXAMPLESDIR%%/timer.h
%%EXAMPLESDIR%%/x86_prof.c
%%EXAMPLESDIR%%/hashsum.c
%%EXAMPLESDIR%%/test.c
%%EXAMPLESDIR%%/timer.c
%%EXAMPLESDIR%%/tv_gen.c
%%PORTDOCS%%%%DOCSDIR%%/crypt.pdf
%%PORTDOCS%%%%DOCSDIR%%/cipher_tv.txt

Return to bug 66099

Lines 1-88 Link Here

(-)security/libtomcrypt/files/patch-dsa.c (-88 lines)
1	--- dsa.c.orig Tue Jan 13 14:52:15 2004
2	+++ dsa.c Tue Jan 13 14:53:54 2004
3	@@ -297,15 +297,15 @@
4	return err;
5	}
6
7	-#define OUTPUT_BIGNUM(num, buf2, y, z) \
8	-{ \
9	- z = (unsigned long)mp_unsigned_bin_size(num); \
10	- if ((y + 4 + z) > *outlen) { return CRYPT_BUFFER_OVERFLOW; } \
11	- STORE32L(z, out+y); \
12	- y += 4; \
13	- if (mp_to_unsigned_bin(num, out+y) != MP_OKAY) { return CRYPT_MEM; } \
14	- y += z; \
15	-}
16	+#define OUTPUT_BIGNUM(num, buf2, y, z) \
17	+{ \
18	+ z = (unsigned long)mp_unsigned_bin_size(num); \
19	+ if ((y + 4 + z) > *outlen) { return CRYPT_BUFFER_OVERFLOW; } \
20	+ STORE32L(z, out+y); \
21	+ y += 4; \
22	+ if (mp_to_unsigned_bin(num, out+y) != MP_OKAY) { return CRYPT_MEM; } \
23	+ y += z; \
24	+}
25
26	int dsa_export(unsigned char out, unsigned long outlen, int type, dsa_key *key)
27	{
28	@@ -352,33 +352,33 @@
29	return CRYPT_OK;
30	}
31
32	-#define INPUT_BIGNUM(num, in, x, y) \
33	-{ \
34	- /* load value */ \
35	- if (y+4 > inlen) { \
36	- err = CRYPT_INVALID_PACKET; \
37	- goto error; \
38	- } \
39	- LOAD32L(x, in+y); \
40	- y += 4; \
41	- \
42	- /* sanity check... */ \
43	- if (y+x > inlen) { \
44	- err = CRYPT_INVALID_PACKET; \
45	- goto error; \
46	- } \
47	- \
48	- /* load it */ \
49	- if (mp_read_unsigned_bin(num, (unsigned char *)in+y, (int)x) != MP_OKAY) {\
50	- err = CRYPT_MEM; \
51	- goto error; \
52	- } \
53	- y += x; \
54	- if (mp_shrink(num) != MP_OKAY) { \
55	- err = CRYPT_MEM; \
56	- goto error; \
57	- } \
58	-}
59	+#define INPUT_BIGNUM(num, in, x, y) \
60	+{ \
61	+ /* load value */ \
62	+ if (y+4 > inlen) { \
63	+ err = CRYPT_INVALID_PACKET; \
64	+ goto error; \
65	+ } \
66	+ LOAD32L(x, in+y); \
67	+ y += 4; \
68	+ \
69	+ /* sanity check... */ \
70	+ if (y+x > inlen) { \
71	+ err = CRYPT_INVALID_PACKET; \
72	+ goto error; \
73	+ } \
74	+ \
75	+ /* load it */ \
76	+ if (mp_read_unsigned_bin(num, (unsigned char *)in+y, (int)x) != MP_OKAY) {\
77	+ err = CRYPT_MEM; \
78	+ goto error; \
79	+ } \
80	+ y += x; \
81	+ if (mp_shrink(num) != MP_OKAY) { \
82	+ err = CRYPT_MEM; \
83	+ goto error; \
84	+ } \
85	+}
86
87	int dsa_import(const unsigned char in, unsigned long inlen, dsa_key key)
88	{

Lines 18-29 Link Here

(-)security/libtomcrypt/pkg-plist (-3 lines)
18	%%EXAMPLESDIR%%/ch2-01.c	18	%%EXAMPLESDIR%%/ch2-01.c
19	%%EXAMPLESDIR%%/encrypt.c	19	%%EXAMPLESDIR%%/encrypt.c
20	%%EXAMPLESDIR%%/small.c	20	%%EXAMPLESDIR%%/small.c
21	%%EXAMPLESDIR%%/timer.asm
22	%%EXAMPLESDIR%%/timer.h
23	%%EXAMPLESDIR%%/x86_prof.c	21	%%EXAMPLESDIR%%/x86_prof.c
24	%%EXAMPLESDIR%%/hashsum.c	22	%%EXAMPLESDIR%%/hashsum.c
25	%%EXAMPLESDIR%%/test.c	23	%%EXAMPLESDIR%%/test.c
26	%%EXAMPLESDIR%%/timer.c
27	%%EXAMPLESDIR%%/tv_gen.c	24	%%EXAMPLESDIR%%/tv_gen.c
28	%%PORTDOCS%%%%DOCSDIR%%/crypt.pdf	25	%%PORTDOCS%%%%DOCSDIR%%/crypt.pdf
29	%%PORTDOCS%%%%DOCSDIR%%/cipher_tv.txt	26	%%PORTDOCS%%%%DOCSDIR%%/cipher_tv.txt