20121205-1740

7 files changed, 20 insertions, 27 deletions

diff --git a/CHANGES b/CHANGES
index 7e9a3922..b912028d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+20121205
+	appl/cmd/mk/mksubdirs [issue 290 change suggested by powerman]
+20120918
+	remove unused/unusable debug/setdebug from appl/lib/auth9.b; use crypt not keyring
 20120820
 	emu/port/devip.c reset headers flag in Conv
 20120725
diff --git a/appl/cmd/mk/mksubdirs b/appl/cmd/mk/mksubdirs
index 3fe01c81..57e8ac4f 100644
--- a/appl/cmd/mk/mksubdirs
+++ b/appl/cmd/mk/mksubdirs
@@ -10,7 +10,7 @@ clean:V: clean-$SHELLTYPE
 		if { ftest -d $j } {
 			echo 'cd' $j '; mk' $MKFLAGS $stem
 			cd $j; mk $MKFLAGS $stem; cd ..
-		} else {
-			! { ftest -e $j }
+		} {
+			! ftest -e $j || raise $j^' not a directory'
 		}
 	}
diff --git a/appl/lib/auth9.b b/appl/lib/auth9.b
index d9f38c71..15fc5a19 100644
--- a/appl/lib/auth9.b
+++ b/appl/lib/auth9.b
@@ -9,22 +9,17 @@ implement Auth9;
 include "sys.m";
 	sys: Sys;
 
-include "keyring.m";
+include "ipints.m";
 
-include "auth9.m";
+include "crypt.m";
 
-debug := 0;
+include "auth9.m";
 
 init()
 {
 	sys = load Sys Sys->PATH;
 }
 
-setdebug(i: int)
-{
-	debug = i;
-}
-
 put2(a: array of byte, v: int)
 {
 	a[0] = byte v;
@@ -253,35 +248,35 @@ encrypt(key: array of byte, data: array of byte, n: int)
 {
 	if(n < 8)
 		return;
-	kr := load Keyring Keyring->PATH;
-	ds := kr->dessetup(des56to64(key), nil);
+	crypt := load Crypt Crypt->PATH;
+	ds := crypt->dessetup(des56to64(key), nil);
 	n--;
 	r := n % 7;
 	n /= 7;
 	j := 0;
 	for(i := 0; i < n; i++){
-		kr->desecb(ds, data[j:], 8, Keyring->Encrypt);
+		crypt->desecb(ds, data[j:], 8, Crypt->Encrypt);
 		j += 7;
 	}
 	if(r)
-		kr->desecb(ds, data[j-7+r:], 8, Keyring->Encrypt);
+		crypt->desecb(ds, data[j-7+r:], 8, Crypt->Encrypt);
 }
 
 decrypt(key: array of byte, data: array of byte, n: int)
 {
 	if(n < 8)
 		return;
-	kr := load Keyring Keyring->PATH;
-	ds := kr->dessetup(des56to64(key), nil);
+	crypt := load Crypt Crypt->PATH;
+	ds := crypt->dessetup(des56to64(key), nil);
 	n--;
 	r := n % 7;
 	n /= 7;
 	j := n*7;
 	if(r)
-		kr->desecb(ds, data[j-7+r:], 8, Keyring->Decrypt);
+		crypt->desecb(ds, data[j-7+r:], 8, Crypt->Decrypt);
 	for(i := 0; i < n; i++){
 		j -= 7;
-		kr->desecb(ds, data[j:], 8, Keyring->Decrypt);
+		crypt->desecb(ds, data[j:], 8, Crypt->Decrypt);
 	}
 }
 
diff --git a/dis/lib/auth9.dis b/dis/lib/auth9.dis
index 211c13f7..00be2aa9 100644
--- a/dis/lib/auth9.dis
+++ b/dis/lib/auth9.dis
diff --git a/include/version.h b/include/version.h
index c741b72d..2b9cbe3c 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION	"Fourth Edition (20120820)"
+#define VERSION	"Fourth Edition (20121205)"
diff --git a/man/2/crypt-crypt b/man/2/crypt-crypt
index 5d079ca4..dba64c59 100644
--- a/man/2/crypt-crypt
+++ b/man/2/crypt-crypt
@@ -136,7 +136,4 @@ bytes of random data.
 .PP
 IDEA was patented by Ascom-Tech AG (EP 0 482 154 B1, US005214703),
 currently held by iT_SEC Systec Ltd.
-At time of writing, there was no licence fee required for noncommercial use
-but check
-the current licensing policy of iT_SEC Systec Ltd,
-especially for commercial use.
+The patent expired in 2012.
diff --git a/man/2/keyring-crypt b/man/2/keyring-crypt
index 6a5be85e..d8bb718c 100644
--- a/man/2/keyring-crypt
+++ b/man/2/keyring-crypt
@@ -135,7 +135,4 @@ bytes of random data.
 .PP
 IDEA was patented by Ascom-Tech AG (EP 0 482 154 B1, US005214703),
 currently held by iT_SEC Systec Ltd.
-At time of writing, there was no licence fee required for noncommercial use
-but check
-the current licensing policy of iT_SEC Systec Ltd,
-especially for commercial use.
+The patent expired in 2012.