X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/5d85da1c8dba900b960ab8fd81e2f8fdb7a7a660..8187950bc47575533beff8a9492c1c2f5e08cba3:/server/tests.at

diff --git a/server/tests.at b/server/tests.at
index 1a3bc4c5..1171fa22 100644
--- a/server/tests.at
+++ b/server/tests.at
@@ -34,9 +34,13 @@ m4_define([SETUPDIR], [
 
 ## Running standard programs with useful options.
 m4_define([TRIPE],
-  [$abs_top_builddir/server/tripe -F -d. -aadmin -p0 -b127.0.0.1 -talice])
+  [env TRIPE_PRIVHELPER=$abs_top_builddir/priv/tripe-privhelper \
+     $abs_top_builddir/server/tripe -F -d. -aadmin -p0 -b127.0.0.1 -talice])
 m4_define([TRIPECTL], [$abs_top_builddir/client/tripectl -d. -aadmin])
 m4_define([USLIP], [$abs_top_builddir/uslip/tripe-uslip])
+m4_define([PKSTREAM],
+  [$abs_top_builddir/pkstream/pkstream -b127.0.0.1 -p127.0.0.1])
+m4_define([MITM], [$abs_top_builddir/proxy/tripe-mitm])
 
 ## Sequences.  (These are used for testing the replay protection machinery.)
 m4_define([R32], [ 0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15   dnl
@@ -47,16 +51,23 @@ m4_define([P32], [21 26 14 12 25 18  2 27 10 31 24 29  0 20 17 11   dnl
 ###--------------------------------------------------------------------------
 ### Scaffolding for running a TrIPE server.
 
+## WITH_TRIPEX(dir, args, body)
 m4_define([WITH_TRIPEX], [
 
+## If this directory doesn't exist then Bad Things will happen.
+if test ! -d $1; then
+  echo >&2 "server directory \`$1' doesn't exist"
+  exit 99
+fi
+
 ## Remove the status file.  This is how we notice that the server's died.
 rm -f $1/server-status
 > $1/expected-server-output
 > $1/expected-server-errors
 
-## Keep Autotest writes crap to standard output, which we don't want going to
-## the server.  So keep a copy of the standard output, do the pipe, and
-## recover the old stdout inside the group.
+## Autotest writes crap to standard output, which we don't want going to the
+## server.  So keep a copy of the standard output, do the pipe, and recover
+## the old stdout inside the group.
 exec 3>&1
 { (
 exec 1>&3 3>&-
@@ -64,21 +75,89 @@ exec 1>&3 3>&-
 ## Wait for the socket to appear.  Watch for the server crashing during
 ## initialization.  Busy waiting is evil, but it's the best I can do and
 ## not sleep for ages.  (Yes, a second on each test group is a long time.)
-while test ! -r $1//server-status && test ! -S $1/admin; do :; done
+while test ! -r $1/server-status && test ! -S $1/admin; do :; done
+
+## Make the port number availale.
+AT_CHECK([TRIPECTL -d$1 PORT],, [stdout])
+mv stdout $1/port
 
 ## Test body...
 $3
 
-## End of the test, now run the server.
+## End of the test, now run the server.  There's an awful hack here.  If a
+## process running under strace exits with a signal, then strace will kill
+## itself with the same signal -- and therefore clobber the original
+## process's core file.  So we arrange to run strace in one directory and
+## have the child process run in another.
 ) && :; } | {
   cd $1
+  mkdir -p strace-hack/
   echo TRIPE $2 >&2
-  strace -f -o tripe.trace TRIPE $2 >server-output 2>server-errors
+  (cd strace-hack/
+   ulimit -c hard >/dev/null 2>&1
+   strace -f -o ../tripe.trace \
+     TRIPE -d.. $2 >../server-output.full 2>../server-errors)
   stat=$?
   echo $stat >server-status
   if test $stat -ne 0; then
     echo "exit status: $stat" >>server-errors
   fi
+
+  ## We interrupt this relatively sensible macro for an especially awful
+  ## hack.  The tripe server emits warnings which are often caused by lack of
+  ## synchronization between two peers.  These are harmless and shouldn't
+  ## cause test failures.  But we shouldn't just trim out all messages that
+  ## look like the spurious ones: if they appear when we're not expecting
+  ## them, that's bad and they should properly cause a test failure.
+  ##
+  ## So we use the WARN command to insert magic directives into the server's
+  ## message stream.  The directives begin with `WARN USER test'; remaining
+  ## tokens may be as follows.
+  ##
+  ## PUSH		Introduce a new layer of nesting.  Settings between
+  ##			this PUSH and the matching POP will be forgotten
+  ##			following the POP.
+  ##
+  ## POP		End a layer of nesting.  See PUSH above.
+  ##
+  ## IGNORE tokens	Ignore lines which begin with the tokens.
+  ##
+  ## Token comparison isn't done very well, but it's good enough for these
+  ## purposes.
+  ##
+  ## We also trim out trace lines here, since it's useful to produce them for
+  ## debugging purposes and changing or introducing more of them shouldn't
+  ## cause failures.
+  awk '
+	BEGIN {
+	  sp = 0;
+	  npat = 0;
+	}
+	$[]1 == "TRACE" { next; }
+	$[]1 == "WARN" && $[]2 == "USER" && $[]3 == "test" {
+	  if ($[]4 == "PUSH")
+	    npatstk[[sp++]] = npat;
+	  else if ($[]4 == "IGNORE") {
+	    s = "";
+	    p = "";
+	    for (i = 5; i <= NF; i++) {
+	      p = p s $[]i;
+	      s = " ";
+	    }
+	    pat[[npat++]] = p;
+	  } else if ($[]4 == "POP")
+	    npat = npatstk[[--sp]];
+	  next;
+	}
+	{
+	  for (i = 0; i < npat; i++) {
+	    n = length(pat[[i]]);
+	    if (substr($[]0, 0, n) == pat[[i]])
+	      next;
+	  }
+	  print $[]0;
+	}
+  ' server-output.full >server-output
 }
 exec 3>&-
 
@@ -89,11 +168,103 @@ AT_CHECK([cat $1/server-output; cat >&2 $1/server-errors],,
 	 [expout], [experr])
 ])
 
+## WITH_TRIPE(args, body)
 m4_define([WITH_TRIPE], [WITH_TRIPEX([.], [$1], [$2])])
 
+## WITH_2TRIPES(adir, bdir, bothargs, aargs, bargs, body)
 m4_define([WITH_2TRIPES],
 	  [WITH_TRIPEX([$1], [$3 $4], [WITH_TRIPEX([$2], [$3 $5], [$6])])])
 
+## WITH_3TRIPES(adir, bdir, cdir, allargs, aargs, bargs, cargs, body)
+m4_define([WITH_3TRIPES],
+	  [WITH_TRIPEX([$1], [$4 $5],
+	  [WITH_TRIPEX([$2], [$4 $6],
+	  [WITH_TRIPEX([$3], [$4 $7],
+	  [$8])])])])
+
+## RETRY(n, body)
+m4_define([RETRY], [
+  n=0 rc=1
+  while test $n -lt $1; do
+    if $2
+    then rc=0; break
+    fi
+    n=$(( $n + 1 ))
+  done
+  exit $rc
+])
+
+## COMMS_EPING(adir, aname, bdir, bname, [n])
+m4_define([COMMS_EPING], [
+  AT_CHECK([RETRY([m4_default([$5], [1])],
+    [TRIPECTL -d$1 EPING $4])],, [ignore])
+  AT_CHECK([RETRY([m4_default([$5], [1])],
+    [TRIPECTL -d$3 EPING $2])],, [ignore])
+])
+
+## COMMS_SLIP(adir, aname, bdir, bname)
+m4_define([COMMS_SLIP], [
+  AT_CHECK([echo "from $1" | USLIP -p $1/$4])
+  AT_CHECK([USLIP -g $3/$2],, [from $1[]nl])
+  AT_CHECK([echo "from $3" | USLIP -p $3/$2])
+  AT_CHECK([USLIP -g $1/$4],, [from $3[]nl])
+])
+
+## AWAIT_KXDONE(adir, aname, bdir, bname, body)
+m4_define([AWAIT_KXDONE], [
+
+  ## Ignore some reports caused by races.
+  TRIPECTL -d$3 WARN test PUSH
+  TRIPECTL -d$3 WARN test IGNORE WARN KX $2 incorrect cookie
+  TRIPECTL -d$3 WARN test IGNORE WARN KX $2 unexpected pre-challenge
+
+  ## Watch for the key-exchange completion announcement in the background.
+  COPROCESSES([wait-$1], [
+    echo WATCH +n
+    while read line; do
+      set x $line; shift
+      echo >&2 ">>> $line"
+      case "$[]1:$[]2:$[]3" in
+	OK::) ;;
+	NOTE:KXDONE:$4) break ;;
+	NOTE:*) ;;
+	*) exit 63 ;;
+      esac
+    done
+  ], [
+    TRIPECTL -d$1
+  ]) & waiter_$1=$!
+
+  $5
+
+  ## Collect the completion announcement.
+  wait $waiter_$1; waitrc=$?
+  AT_CHECK([echo $waitrc],, [0[]nl])
+
+  ## Be interested in key-exchange warnings again.
+  TRIPECTL -d$4 WARN test POP
+])
+
+## ESTABLISH(adir, aname, aopts, bdir, bname, bopts, [aport], [bport])
+m4_define([ESTABLISH], [
+
+  ## Set up the establishment.
+  AWAIT_KXDONE([$1], [$2], [$4], [$5], [
+    AT_CHECK([TRIPECTL -d$1 ADD -cork $6 $5 INET 127.0.0.1 \
+      m4_if([$8], [], [$(cat $4/port)], [$8])])
+    AT_CHECK([TRIPECTL -d$4 ADD $3 $2 INET 127.0.0.1 \
+      m4_if([$7], [], [$(cat $1/port)], [$7])])
+  ])
+
+  ## Check transport pinging.
+  AT_CHECK([TRIPECTL -d$1 PING $5],, [ignore])
+  AT_CHECK([TRIPECTL -d$4 PING $2],, [ignore])
+
+  ## Check communication works.
+  COMMS_EPING([$1], [$2], [$4], [$5])
+  COMMS_SLIP([$1], [$2], [$4], [$5])
+])
+
 ###--------------------------------------------------------------------------
 ### Very unpleasant coprocess handling.
 
@@ -105,8 +276,8 @@ rm -f pipe-$1; mknod pipe-$1 p
 
 ## TRIPECTL_INTERACT(ARGS, SHELLSTUFF)
 m4_define([TRIPECTL_INTERACT], [
-  exec 3<&1
-  COPROCESSES([client], [exec 4>&1 1>&3 $2], [TRIPECTL $1])
+  exec 3>&1
+  COPROCESSES([client], [exec 4>&1 1>&3 $1], [TRIPECTL $2])
 ])
 
 ## TRIPECTL_COMMAND(CMD, EXPECT)
@@ -126,7 +297,7 @@ m4_define([TRIPECTL_COMMAND], [
 ### Make sure the thing basically works.
 
 AT_SETUP([server basics])
-SETUPDIR([ec])
+SETUPDIR([alpha])
 AT_CHECK([echo port | TRIPE -p54321],, [INFO 54321[]nl[]OK[]nl])
 AT_CLEANUP
 
@@ -135,7 +306,7 @@ AT_CLEANUP
 
 AT_SETUP([server challenges])
 AT_KEYWORDS([chal])
-SETUPDIR([ec])
+SETUPDIR([alpha])
 
 WITH_TRIPE(, [
   ## A simple test.
@@ -193,55 +364,251 @@ AT_SETUP([server communication])
 AT_KEYWORDS([comm])
 export TRIPE_SLIPIF=USLIP
 
-for i in alice bob; do (mkdir $i; cd $i; SETUPDIR([ec])); done
+for p in alice bob; do (mkdir $p; cd $p; SETUPDIR([alpha])); done
 
 WITH_2TRIPES([alice], [bob], [-nslip], [-talice], [-tbob], [
+  ESTABLISH([alice], [not-alice], [-key alice],
+	    [bob], [bob], [])
+])
 
-  AT_CHECK([TRIPECTL -dalice PORT],, [stdout])
-  mv stdout alice/port
+AT_CLEANUP
 
-  AT_CHECK([TRIPECTL -dbob PORT],, [stdout])
-  mv stdout bob/port
+###--------------------------------------------------------------------------
+### Mobile peer tracking.
 
-  ## Watch for the key-exchange completion announcement, and then exit.
-  COPROCESSES([wait], [
-    echo WATCH +n
-    while read line; do
-      case "$line" in
-        OK) ;;
-	"NOTE KXDONE "*) break ;;
-	NOTE*) ;;
-	*) exit 63 ;;
-      esac
-    done
-  ], [
-    TRIPECTL -dalice
-  ]) &
+AT_SETUP([peer tracking])
+AT_KEYWORDS([mobile])
+export TRIPE_SLIPIF=USLIP
 
-  ## Don't panic if you don't see the unexpected-source warning.  It happens
-  ## for me, but it's not important either way.
-  AT_CHECK([TRIPECTL -dalice ADD bob INET 127.0.0.1 $(cat bob/port)])
-  echo >>bob/expected-server-output \
-    "WARN PEER - unexpected-source INET 127.0.0.1 $(cat alice/port)"
-  AT_CHECK([TRIPECTL -dbob ADD alice INET 127.0.0.1 $(cat alice/port)])
+for p in alice bob carol; do (mkdir $p; cd $p; SETUPDIR([alpha])); done
+
+## WITH_PKSTREAM(adir, aport, bdir, bport, body)
+m4_define([WITH_PKSTREAM], [
+  echo >&2 "pkstream: $1 <--> :$2 <-pkstream-> :$4 <--> $3"
+  PKSTREAM -l$4 127.0.0.1:$4 127.0.0.1:$(cat $3/port)& pkstream_$3_$1=$!
+  sleep 1
+  PKSTREAM -c127.0.0.1:$4 127.0.0.1:$2 127.0.0.1:$(cat $1/port)&
+  pkstream_$1_$3=$!
+  set +x
+  $5
+  kill $pkstream_$3_$1 $pkstream_$1_$3
+])
 
-  ## Check transport pinging.
-  AT_CHECK([TRIPECTL -dalice PING bob],, [ignore])
-  AT_CHECK([TRIPECTL -dbob PING alice],, [ignore])
+WITH_3TRIPES([alice], [bob], [carol], [-nslip],
+	     [-talice], [-tbob], [-tcarol], [
+
+  ## We need an indirection layer between the two peers so that we can
+  ## simulate the effects of NAT remapping.  The nearest thing we have to
+  ## this is pkstream, so we may as well use that.
+  ##
+  ## alice <--> :5311 <-pkstream-> :5312 <--> bob
+  ## alice <--> :5321 <-pkstream-> :5322 <--> carol
+
+  WITH_PKSTREAM([alice], [5311], [bob], [5312], [
+    ESTABLISH([alice], [alice], [], [bob], [bob], [-mobile], [5312], [5311])
+  ])
+
+  WITH_PKSTREAM([alice], [5319], [bob], [5312], [
+    COMMS_EPING([bob], [bob], [alice], [alice])
+    COMMS_SLIP([bob], [bob], [alice], [alice])
+  ])
 
-  ## Wait for the completion announcement.
+  WITH_PKSTREAM([alice], [5321], [carol], [5322], [
+    ESTABLISH([alice], [alice], [], [carol], [carol], [-mobile],
+	[5322], [5321])
+  ])
+
+  WITH_PKSTREAM([alice], [5311], [bob], [5312], [
+  WITH_PKSTREAM([alice], [5321], [carol], [5322], [
+    COMMS_EPING([bob], [bob], [alice], [alice])
+    COMMS_EPING([carol], [carol], [alice], [alice])
+    COMMS_SLIP([bob], [bob], [alice], [alice])
+    COMMS_SLIP([carol], [carol], [alice], [alice])
+  ])])
+
+  WITH_PKSTREAM([alice], [5321], [bob], [5312], [
+  WITH_PKSTREAM([alice], [5311], [carol], [5322], [
+    COMMS_EPING([bob], [bob], [alice], [alice])
+    COMMS_EPING([carol], [carol], [alice], [alice])
+    COMMS_SLIP([bob], [bob], [alice], [alice])
+    COMMS_SLIP([carol], [carol], [alice], [alice])
+  ])])
   wait
+])
+
+AT_CLEANUP
+
+###--------------------------------------------------------------------------
+### Adverse communication.
+
+AT_SETUP([server retry])
+AT_KEYWORDS([backoff])
+export TRIPE_SLIPIF=USLIP
+
+for i in alice bob; do (mkdir $i; cd $i; SETUPDIR([beta])); done
+
+WITH_2TRIPES([alice], [bob], [-nslip], [-talice], [-tbob], [
+
+  ## Set up the evil proxy.
+  alicemitm=24516 bobmitm=14016
+  MITM -kalice/keyring.pub >mitm.out 2>mitm.err \
+    peer:alice:$alicemitm:127.0.0.1:$(cat alice/port) \
+    peer:bob:$bobmitm:127.0.0.1:$(cat bob/port) \
+    filt:drop:5 filt:send& mitmpid=$!
+  strace -omitm.trace -p$mitmpid& mitmtrace=$!
+  trap 'kill $mitmpid $mitmtrace; exit 127' EXIT INT QUIT TERM HUP
+
+  ## Try to establish keys anyway.
+  AWAIT_KXDONE([alice], [alice], [bob], [bob], [
+    AT_CHECK([TRIPECTL -dalice ADD -cork bob   INET 127.0.0.1 $alicemitm])
+    AT_CHECK([TRIPECTL -dbob   ADD       alice INET 127.0.0.1 $bobmitm])
+  ])
+
+  ## Check pinging.
+  COMMS_EPING([alice], [alice], [bob], [bob], [10])
+  COMMS_EPING([bob], [bob], [alice], [alice], [10])
+
+  ## Tear down the MITM proxy.
+  kill $mitmpid
+  wait $mitmpid
+  wait $mitmtrace
+])
+
+AT_CLEANUP
+
+###--------------------------------------------------------------------------
+### Key management.
+
+AT_SETUP([server key-management])
+AT_KEYWORDS([keymgmt])
+export TRIPE_SLIPIF=USLIP
 
-  ## Check encrypted pinging.
-  AT_CHECK([TRIPECTL -dalice EPING bob],, [ignore])
-  AT_CHECK([TRIPECTL -dbob EPING alice],, [ignore])
+## Determine all of the nets and the principals.
+princs=""
+nets=" "
+while read princ pnets; do
+  princs="$princs $princ"
+  for n in $pnets; do
+    case " $nets " in *" $n "*) ;; *) nets="$nets$n " ;; esac
+  done
+done <<PRINC
+alice	alpha	beta
+bob	alpha	beta
+carol	beta
+PRINC
+
+## Build the master keyring.  All key tags here are of the form PRINC/NET.
+for n in $nets; do
+  key -k$abs_top_srcdir/t/keyring-$n extract keyring-$n $princs
+  for p in $princs; do key -kkeyring-$n tag $p $p/$n; done
+  key merge keyring-$n
+  rm keyring-$n
+done
+key extract -f-secret keyring.pub
+
+## Set up the principals' directories.
+for p in $princs; do
+  mkdir $p
+  cp keyring keyring.pub $p/
+done
+
+WITH_3TRIPES([alice], [bob], [carol], [-nslip -Tmx],
+	[-talice/alpha], [-tbob/alpha], [-tcarol/beta], [
+
+  ## Establish this little merry-go-round.
+  ESTABLISH([alice], [alice], [-key alice/alpha],
+	[bob], [bob], [-key bob/alpha])
+  ESTABLISH([alice], [alice], [-key alice/beta],
+	[carol], [carol], [-priv alice/beta -key carol/beta])
+  ESTABLISH([bob], [bob], [-key bob/beta],
+	[carol], [carol], [-priv bob/beta -key carol/beta])
+
+  ## Tweak Bob's alpha key.
+  for p in $princs; do
+    TRIPECTL -d$p WARN test COMMENT tweak bob/alpha
+  done
+
+  key -k$abs_top_srcdir/t/keyring-alpha extract keyring-bob-new bob-new
+  key merge keyring-bob-new
+  key tag -r bob-new bob/alpha
+  key extract -f-secret keyring.pub
+  for p in alice bob; do cp keyring keyring.pub $p/; done
+
+  ## Kick the peers to see whether they update.
+  AWAIT_KXDONE([alice], [alice], [bob], [bob], [
+    TRIPECTL -dalice RELOAD
+    TRIPECTL -dbob RELOAD
+    TRIPECTL -dalice FORCEKX bob
+    TRIPECTL -dbob FORCEKX alice
+  ])
+
+  COMMS_EPING([alice], [alice], [bob], [bob])
+  COMMS_EPING([bob], [bob], [alice], [alice])
 
-  ## Check that packets can flow from one to the other.
-  AT_CHECK([echo "from alice" | USLIP -p alice/bob])
-  AT_CHECK([USLIP -g bob/alice],, [from alice[]nl])
+  ## Update the beta ring.
+  key merge $abs_top_srcdir/t/keyring-beta-new
+  for p in $princs; do key tag -r $p $p/beta; done
+  key extract -f-secret keyring.pub
+
+  ## Update alice's and carol's private keys, bob's public.  This should be
+  ## insufficient for them to switch, but the results could be interesting.
+  for p in $princs; do
+    TRIPECTL -d$p WARN test COMMENT tweak beta step 1
+  done
+
+  for p in alice carol; do cp keyring $p/; done
+  cp keyring.pub bob/
+  for p in $princs; do TRIPECTL -d$p RELOAD; done
+
+  AT_DATA([algs-alpha], [dnl
+kx-group=ec kx-group-order-bits=256 kx-group-elt-bits=512
+hash=rmd160 mgf=rmd160-mgf hash-sz=20
+cipher=blowfish-cbc cipher-keysz=20 cipher-blksz=8
+cipher-data-limit=67108864
+mac=rmd160-hmac mac-keysz=20 mac-tagsz=10
+])
 
-  AT_CHECK([echo "from bob" | USLIP -p bob/alice])
-  AT_CHECK([USLIP -g alice/bob],, [from bob[]nl])
+  AT_DATA([algs-beta-old], [dnl
+kx-group=prime kx-group-order-bits=160 kx-group-elt-bits=1023
+hash=rmd160 mgf=rmd160-mgf hash-sz=20
+cipher=blowfish-cbc cipher-keysz=20 cipher-blksz=8
+cipher-data-limit=67108864
+mac=rmd160-hmac mac-keysz=20 mac-tagsz=10
+])
+
+  AT_DATA([algs-beta-new], [dnl
+kx-group=ec kx-group-order-bits=161 kx-group-elt-bits=320
+hash=rmd160 mgf=rmd160-mgf hash-sz=20
+cipher=blowfish-cbc cipher-keysz=20 cipher-blksz=8
+cipher-data-limit=67108864
+mac=rmd160-hmac mac-keysz=20 mac-tagsz=10
+])
+
+  cp algs-alpha expout;    AT_CHECK([TRIPECTL -dalice ALGS],,       [expout])
+  cp algs-beta-old expout; AT_CHECK([TRIPECTL -dalice ALGS carol],, [expout])
+  cp algs-beta-old expout; AT_CHECK([TRIPECTL -dbob   ALGS carol],, [expout])
+  cp algs-beta-new expout; AT_CHECK([TRIPECTL -dcarol ALGS],,       [expout])
+  cp algs-beta-old expout; AT_CHECK([TRIPECTL -dcarol ALGS alice],, [expout])
+
+  ## Now copy the full keys.  We expect this to provoke key exchange.
+  for p in $princs; do
+    TRIPECTL -d$p WARN test COMMENT tweak beta step 2
+  done
+
+  for p in $princs; do cp keyring keyring.pub $p/; done
+
+  AWAIT_KXDONE([alice], [alice], [carol], [carol], [
+    TRIPECTL -dalice RELOAD
+    AWAIT_KXDONE([bob], [bob], [carol], [carol], [
+      TRIPECTL -dbob RELOAD
+      TRIPECTL -dcarol RELOAD
+    ])
+  ])
+
+  cp algs-alpha expout;    AT_CHECK([TRIPECTL -dalice ALGS],,       [expout])
+  cp algs-beta-new expout; AT_CHECK([TRIPECTL -dalice ALGS carol],, [expout])
+  cp algs-beta-new expout; AT_CHECK([TRIPECTL -dbob   ALGS carol],, [expout])
+  cp algs-beta-new expout; AT_CHECK([TRIPECTL -dcarol ALGS],,       [expout])
 ])
 
 AT_CLEANUP
@@ -251,7 +618,7 @@ AT_CLEANUP
 
 AT_SETUP([server services])
 AT_KEYWORDS([svc])
-SETUPDIR([ec])
+SETUPDIR([alpha])
 
 WITH_TRIPE(, [
 
@@ -266,9 +633,9 @@ WITH_TRIPE(, [
     read line
     case "$line" in
       OK)
-        ;;
+	;;
       *)
-        echo >&2 "SVCCLAIM failed: $line"
+	echo >&2 "SVCCLAIM failed: $line"
 	exit 1
 	;;
     esac
@@ -293,7 +660,7 @@ WITH_TRIPE(, [
 	    case "$[]1,$[]2,$[]3,$[]4" in
 	      SVCCANCEL,$tag,,) break ;;
 	      SVCJOB,*,test,ESCAPE)
-	        echo >&2 "attempt to escape from alkatraz"
+		echo >&2 "attempt to escape from alkatraz"
 		exit 1
 		;;
 	    esac