ver bump

7 files changed, 15 insertions, 236 deletions

diff --git a/dev-libs/libtomcrypt/ChangeLog b/dev-libs/libtomcrypt/ChangeLog
index fff9db74f0e0..3c1c87e8a42d 100644
--- a/dev-libs/libtomcrypt/ChangeLog
+++ b/dev-libs/libtomcrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libtomcrypt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/ChangeLog,v 1.17 2004/06/25 03:15:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/ChangeLog,v 1.18 2004/07/24 00:38:42 vapier Exp $
+
+*libtomcrypt-0.97b (23 Jul 2004)
+
+  23 Jul 2004; Mike Frysinger <vapier@gentoo.org> -files/0.93-doc-fix.patch,
+  -files/ocb.c.patch, -libtomcrypt-0.97a.ebuild, +libtomcrypt-0.97b.ebuild:
+  Version bump.
 
 *libtomcrypt-0.97a (23 Jun 2004)
 
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index cc7f4339115e..aa2e3f006066 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 52545fa2d4f28c080b12b17d247e761a ChangeLog 2025
+MD5 491c6ab4ebb9f7fcb50b7b99b654a3cf ChangeLog 2227
+MD5 88f72013e06b3ca10468fa0865508921 libtomcrypt-0.97b.ebuild 837
 MD5 8e170189f60a2ed2879b9deb471f2e07 metadata.xml 2276
-MD5 906e1b89a7080c4e96de61406c15c670 libtomcrypt-0.97a.ebuild 837
-MD5 fcfac66b6043358fb9a1f272f25de48f files/0.93-doc-fix.patch 791
-MD5 def65b83db5acc5c42dd6b6d1764e999 files/ocb.c.patch 6288
-MD5 99994efcad208852e941de49e9a11891 files/digest-libtomcrypt-0.97a 64
+MD5 41a02d98c847ad2690feca120ba74ba0 files/digest-libtomcrypt-0.97b 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.8 (GNU/Linux)
 
-iD8DBQFA+b54HTu7gpaalycRAsk3AJ4gMC0MJD+XXSOHExNxtD5LxjLvuwCdH6e2
-BRX2cHWVD+tb8YGogX42QIo=
-=qi76
+iD8DBQFBAa+uHTu7gpaalycRAmNgAKChMtV8jx6rQlOWVy51MK1inyniQACgvtZR
+aby9VV3B2ewoXU/qe7wNRpI=
+=szM0
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libtomcrypt/files/0.93-doc-fix.patch b/dev-libs/libtomcrypt/files/0.93-doc-fix.patch
deleted file mode 100644
index 6370cdbeea7a..000000000000
--- a/dev-libs/libtomcrypt/files/0.93-doc-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- makefile	2003-06-12 13:58:30.000000000 -0400
-+++ makefile.orig	2003-06-12 13:58:07.000000000 -0400
-@@ -109,13 +109,11 @@
- #This rule installs the library and the header files. This must be run
- #as root in order to have a high enough permission to write to the correct
- #directories and to set the owner and group to root.
-+install: library
--install: library docs
- 	install -d -g root -o root $(DESTDIR)$(LIBPATH)
- 	install -d -g root -o root $(DESTDIR)$(INCPATH)
--	install -d -g root -o root $(DESTDIR)$(DATAPATH)
- 	install -g root -o root $(LIBNAME) $(DESTDIR)$(LIBPATH)
- 	install -g root -o root $(HEADERS) $(DESTDIR)$(INCPATH)
--	install -g root -o root crypt.pdf $(DESTDIR)$(DATAPATH)
- 
- #This rule cleans the source tree of all compiled code, not including the pdf
- #documentation.
diff --git a/dev-libs/libtomcrypt/files/digest-libtomcrypt-0.97a b/dev-libs/libtomcrypt/files/digest-libtomcrypt-0.97a
deleted file mode 100644
index dd6d0ab0b51c..000000000000
--- a/dev-libs/libtomcrypt/files/digest-libtomcrypt-0.97a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1345cacd7a4724fbbbd6757ddcf9db8 crypt-0.97a.tar.bz2 838998
diff --git a/dev-libs/libtomcrypt/files/digest-libtomcrypt-0.97b b/dev-libs/libtomcrypt/files/digest-libtomcrypt-0.97b
new file mode 100644
index 000000000000..226a88db387f
--- /dev/null
+++ b/dev-libs/libtomcrypt/files/digest-libtomcrypt-0.97b
@@ -0,0 +1 @@
+MD5 c50391a6abdfcabc4e5732a98481b9f0 crypt-0.97b.tar.bz2 843071
diff --git a/dev-libs/libtomcrypt/files/ocb.c.patch b/dev-libs/libtomcrypt/files/ocb.c.patch
deleted file mode 100644
index c3a593c4d118..000000000000
--- a/dev-libs/libtomcrypt/files/ocb.c.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- ../libtomcrypt-0.93/ocb.c	2004-01-25 13:40:32.869240000 -0500
-+++ ocb.c	2004-01-26 12:34:40.621438400 -0500
-@@ -34,8 +34,7 @@
- int ocb_init(ocb_state *ocb, int cipher, 

-              const unsigned char *key, unsigned long keylen, const unsigned char *nonce)

- {

--   int x, y, z, m, p, err;

--   unsigned char tmp[MAXBLOCKSIZE];

-+   int x, y, m, err;

- 

-    _ARGCHK(ocb != NULL);

-    _ARGCHK(key != NULL);

-@@ -139,7 +138,7 @@
- int ocb_encrypt(ocb_state *ocb, const unsigned char *pt, unsigned char *ct)

- {

-    unsigned char Z[MAXBLOCKSIZE], tmp[MAXBLOCKSIZE];

--   int err, x, y;

-+   int err, x;

- 

-    _ARGCHK(ocb != NULL);

-    _ARGCHK(pt  != NULL);

-@@ -178,7 +177,7 @@
- int ocb_decrypt(ocb_state *ocb, const unsigned char *ct, unsigned char *pt)

- {

-    unsigned char Z[MAXBLOCKSIZE], tmp[MAXBLOCKSIZE];

--   int err, x, y;

-+   int err, x;

- 

-    _ARGCHK(ocb != NULL);

-    _ARGCHK(pt  != NULL);

-@@ -228,7 +227,7 @@
- 

- {

-    unsigned char Z[MAXBLOCKSIZE], Y[MAXBLOCKSIZE], X[MAXBLOCKSIZE];

--   int err, x, y;

-+   int err, x;

- 

-    _ARGCHK(ocb != NULL);

-    _ARGCHK(pt  != NULL);

-@@ -247,7 +246,8 @@
-    shift_xor(ocb, X); 

-    memcpy(Z, X, ocb->block_len);

- 

--   X[ocb->block_len-1] ^= ptlen&255;

-+   X[ocb->block_len-1] ^= (ptlen*8)&255;

-+   X[ocb->block_len-2] ^= ((ptlen*8)>>8)&255;

-    for (x = 0; x < ocb->block_len; x++) {

-        X[x] ^= ocb->Lr[x]; 

-    }

-@@ -346,9 +346,16 @@
-           unsigned char *ct,

-           unsigned char *tag,    unsigned long *taglen)

- {

--   int err, n;

-+   int err;

-    ocb_state ocb;

- 

-+   _ARGCHK(key    != NULL);

-+   _ARGCHK(nonce  != NULL);

-+   _ARGCHK(pt     != NULL);

-+   _ARGCHK(ct     != NULL);

-+   _ARGCHK(tag    != NULL);

-+   _ARGCHK(taglen != NULL);

-+

-    if ((err = ocb_init(&ocb, cipher, key, keylen, nonce)) != CRYPT_OK) {

-       return err;

-    }

-@@ -378,9 +385,17 @@
-     const unsigned char *tag,    unsigned long taglen,

-           int           *res)

- {

--   int err, n;

-+   int err;

-    ocb_state ocb;

- 

-+

-+   _ARGCHK(key    != NULL);

-+   _ARGCHK(nonce  != NULL);

-+   _ARGCHK(pt     != NULL);

-+   _ARGCHK(ct     != NULL);

-+   _ARGCHK(tag    != NULL);

-+   _ARGCHK(res    != NULL);

-+

-    if ((err = ocb_init(&ocb, cipher, key, keylen, nonce)) != CRYPT_OK) {

-       return err;

-    }

-@@ -412,84 +427,84 @@
-          unsigned char key[16], nonce[16], pt[32], ct[32], tag[16];

-    } tests[] = {

- 

--   /* NULL message */

-+   /* OCB-AES-128-0B */

- {

-    0,

-    /* key */

-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,

-      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },

-    /* nonce */

--   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,

--     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },

-+   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },

-    /* pt */

--   { 0x00 },

-+   { 0 },

-    /* ct */

--   { 0x00 },

-+   { 0 },

-    /* tag */

--   { 0x04, 0xad, 0xa4, 0x5e, 0x94, 0x7b, 0xc5, 0xb6,

--     0xe0, 0x0f, 0x4c, 0x8b, 0x80, 0x53, 0x90, 0x2d }

-+   { 0x15, 0xd3, 0x7d, 0xd7, 0xc8, 0x90, 0xd5, 0xd6,

-+     0xac, 0xab, 0x92, 0x7b, 0xc0, 0xdc, 0x60, 0xee },

- },

--   

--   /* one byte message */

-+

-+

-+   /* OCB-AES-128-3B */

- {

--   1,

-+   3, 

-    /* key */

-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,

-      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },

-    /* nonce */

--   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,

--     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },

-+   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },

-    /* pt */

--   { 0x11 },

-+   { 0x00, 0x01, 0x02 },

-    /* ct */

--   { 0x6f },

-+   { 0xfc, 0xd3, 0x7d },

-    /* tag */

--   { 0xe2, 0x61, 0x42, 0x3e, 0xbb, 0x0e, 0x7f, 0x3b,

--     0xa6, 0xdd, 0xf1, 0x3e, 0xe8, 0x0b, 0x7b, 0x00}

-+   { 0x02, 0x25, 0x47, 0x39, 0xa5, 0xe3, 0x56, 0x5a,

-+     0xe2, 0xdc, 0xd6, 0x2c, 0x65, 0x97, 0x46, 0xba },

- },

- 

--   /* 16 byte message */

-+   /* OCB-AES-128-16B */

- {

--   16,

-+   16, 

-    /* key */

-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,

-      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },

-    /* nonce */

--   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,

--     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },

-+   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },

-    /* pt */

-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,

-      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },

-    /* ct */

--   { 0x6a, 0xaf, 0xac, 0x40, 0x6d, 0xfa, 0x87, 0x40,

--     0x57, 0xc7, 0xdb, 0xe9, 0x6f, 0x1b, 0x39, 0x53 },

-+   { 0x37, 0xdf, 0x8c, 0xe1, 0x5b, 0x48, 0x9b, 0xf3,

-+     0x1d, 0x0f, 0xc4, 0x4d, 0xa1, 0xfa, 0xf6, 0xd6 },

-    /* tag */

--   { 0xff, 0xbf, 0x96, 0x87, 0x72, 0xfe, 0xee, 0x59,

--     0x08, 0x1f, 0xc7, 0x8c, 0x8f, 0xd9, 0x16, 0xc2 }

-+   { 0xdf, 0xb7, 0x63, 0xeb, 0xdb, 0x5f, 0x0e, 0x71,

-+     0x9c, 0x7b, 0x41, 0x61, 0x80, 0x80, 0x04, 0xdf },

- },

- 

--   /* 17 byte message */

-+   /* OCB-AES-128-20B  */

- {

--   17,

-+   20, 

-    /* key */

-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,

-      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },

-    /* nonce */

--   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,

--     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },

-+   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },

-    /* pt */

-    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,

--     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,

--     0x10 },

-+     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 

-+     0x10, 0x11, 0x12, 0x13 },

-    /* ct */

--   { 0x8c, 0x94, 0xbd, 0xd4, 0x2d, 0xdd, 0x1c, 0x40,

--     0xbe, 0xe0, 0x06, 0xb5, 0xab, 0x54, 0x3b, 0x00,

--     0x20 },

-+   { 0x01, 0xa0, 0x75, 0xf0, 0xd8, 0x15, 0xb1, 0xa4,

-+     0xe9, 0xc8, 0x81, 0xa1, 0xbc, 0xff, 0xc3, 0xeb,

-+     0x70, 0x03, 0xeb, 0x55},

-    /* tag */

--   { 0x0e, 0x72, 0x7c, 0x88, 0x73, 0xbb, 0x66, 0xd7,

--     0x4a, 0x4f, 0xd4, 0x84, 0x83, 0xc7, 0x9a, 0x29 }

--}

--

-+   { 0x75, 0x30, 0x84, 0x14, 0x4e, 0xb6, 0x3b, 0x77,

-+     0x0b, 0x06, 0x3c, 0x2e, 0x23, 0xcd, 0xa0, 0xbb },

-+},

- };

- 

-    int err, x, idx, res;

diff --git a/dev-libs/libtomcrypt/libtomcrypt-0.97a.ebuild b/dev-libs/libtomcrypt/libtomcrypt-0.97b.ebuild
index e1f0da49b604..789b2c7457e0 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-0.97a.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-0.97b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/libtomcrypt-0.97a.ebuild,v 1.3 2004/07/18 00:03:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/libtomcrypt-0.97b.ebuild,v 1.1 2004/07/24 00:38:42 vapier Exp $
 
 inherit eutils