server/tests.at: Eliminate redundant `-talice' option.

This makes searching for the correct `tripe' process easier at runtime.
But it means that we have to associate explicit `kx-group' attributes
with the keys rather than attaching the group to the key type.

diff --git a/server/tests.at b/server/tests.at
index 4aadc30..4da5f9a 100644 (file)
--- a/server/tests.at
+++ b/server/tests.at
@@ -34,7 +34,7 @@ m4_define([SETUPDIR], [
 ## Running standard programs with useful options.
 m4_define([TRIPE],
   [env TRIPE_PRIVHELPER=$abs_top_builddir/priv/tripe-privhelper \
-     $abs_top_builddir/server/tripe -F -d. -aadmin -p0 -b127.0.0.1 -talice \
+     $abs_top_builddir/server/tripe -F -d. -aadmin -p0 -b127.0.0.1 \
        ${TRIPE_TEST_TRACEOPTS+-T$TRIPE_TEST_TRACEOPTS}])
 m4_define([TRIPECTL], [$abs_top_builddir/client/tripectl -d. -aadmin])
 m4_define([USLIP], [$abs_top_builddir/uslip/tripe-uslip])

diff --git a/t/keyring-alpha b/t/keyring-alpha
index 321bc09..f594e21 100644 (file)
--- a/t/keyring-alpha
+++ b/t/keyring-alpha
@@ -1,5 +1,5 @@
-6f825e20:tripe-x25519:bob struct:[pub=binary,public:r+C4uNU0b06HsBunjoYEuzrij92jZi81/jPaQWjMAG4=,private=struct:[priv=binary,private,burn:jxcgIQSi6Otuvfl0Xd8JXL3p5mNFyuMKxCm4e1Zu2Us=]] forever forever hash=sha256&cipher=chacha20&bulk=naclbox
-03349b54:tripe-x25519:bob-new struct:[pub=binary,public:T1Xkv+kA2inWUsoF1HMhQV9l7FFUVAuqJaIfSIbo/wY=,private=struct:[priv=binary,private,burn:yYvE82HsJlk3wOSi1gXJL0laeo1f+Af4u+fjIzU7Hoo=]] forever forever hash=sha256&cipher=chacha20&bulk=naclbox
-abff7e38:tripe-x25519-param string,shared:%3cempty%3e forever forever hash=sha256&cipher=chacha20&bulk=naclbox
-fbf10a4e:tripe-x25519:alice struct:[pub=binary,public:n27vXTI/1lyxTlx3iDPAYfuhuRrGTc5/ohJfFsvQRl8=,private=struct:[priv=binary,private,burn:9OsXq+xPsDeAujcy6+tLBTyfXuqBYhrKazWzR/6cH5w=]] forever forever hash=sha256&cipher=chacha20&bulk=naclbox
-4c758f1e:tripe-x25519:carol struct:[pub=binary,public:yi7XVssUkQePU/1ybS6XkwrqvXqWaN04XboBj/r+jmA=,private=struct:[priv=binary,private,burn:++CCD35eVRUPsML4B4rT4n+QiUpBcQbdO5+WF82b/Bk=]] forever forever hash=sha256&cipher=chacha20&bulk=naclbox
+6f825e20:tripe:bob struct:[pub=binary,public:r+C4uNU0b06HsBunjoYEuzrij92jZi81/jPaQWjMAG4=,private=struct:[priv=binary,private,burn:jxcgIQSi6Otuvfl0Xd8JXL3p5mNFyuMKxCm4e1Zu2Us=]] forever forever kx-group=x25519&hash=sha256&cipher=chacha20&bulk=naclbox
+03349b54:tripe:bob-new struct:[pub=binary,public:T1Xkv+kA2inWUsoF1HMhQV9l7FFUVAuqJaIfSIbo/wY=,private=struct:[priv=binary,private,burn:yYvE82HsJlk3wOSi1gXJL0laeo1f+Af4u+fjIzU7Hoo=]] forever forever kx-group=x25519&hash=sha256&cipher=chacha20&bulk=naclbox
+abff7e38:tripe-param string,shared:%3cempty%3e forever forever kx-group=x25519&hash=sha256&cipher=chacha20&bulk=naclbox
+fbf10a4e:tripe:alice struct:[pub=binary,public:n27vXTI/1lyxTlx3iDPAYfuhuRrGTc5/ohJfFsvQRl8=,private=struct:[priv=binary,private,burn:9OsXq+xPsDeAujcy6+tLBTyfXuqBYhrKazWzR/6cH5w=]] forever forever kx-group=x25519&hash=sha256&cipher=chacha20&bulk=naclbox
+4c758f1e:tripe:carol struct:[pub=binary,public:yi7XVssUkQePU/1ybS6XkwrqvXqWaN04XboBj/r+jmA=,private=struct:[priv=binary,private,burn:++CCD35eVRUPsML4B4rT4n+QiUpBcQbdO5+WF82b/Bk=]] forever forever kx-group=x25519&hash=sha256&cipher=chacha20&bulk=naclbox

diff --git a/t/keyring-beta b/t/keyring-beta
index 1285dfb..534d91c 100644 (file)
--- a/t/keyring-beta
+++ b/t/keyring-beta
@@ -1,4 +1,4 @@
-bafb2876:tripe-dh:carol struct:[p=integer,shared:69775951038073580217048751187698556149910661999359201823421066000439190288124938297116840422332973903349265313226189724474672148172906743149961449018143681316055777549225333684417216672046201528908637006946721694566251047975893301628540057123962444434130461052652526277961662241061299058137499738575071867183,g=integer,shared:24031880137812767104513348688448999056754549625670167617628008814539123937598464069755252337842705625768270002772600104095116713027947418314704258588569425678035630653993833866258334547988915311887541947589468379164053328339235797437698686107421712042993209960764868024283667188725341401853595169622553906137,private=struct:[x=integer,private,burn:73991155902179945261508509191547148355158375351],y=integer,public:37069178228377811166030071731849765678259693396714688962600218701483091198810506754964630489911246536883135042437408082007532504680074395403119352076064967233299326035447428716504321984168387644976048560331078815373900584178897334717028451802614990292165323963715739372593761778142664403111989271476234631785,q=integer,shared:741802303617786660769426556982216255271020758647] forever forever -
-b9839a99:tripe-dh:bob struct:[p=integer,shared:69775951038073580217048751187698556149910661999359201823421066000439190288124938297116840422332973903349265313226189724474672148172906743149961449018143681316055777549225333684417216672046201528908637006946721694566251047975893301628540057123962444434130461052652526277961662241061299058137499738575071867183,g=integer,shared:24031880137812767104513348688448999056754549625670167617628008814539123937598464069755252337842705625768270002772600104095116713027947418314704258588569425678035630653993833866258334547988915311887541947589468379164053328339235797437698686107421712042993209960764868024283667188725341401853595169622553906137,private=struct:[x=integer,private,burn:375609211293082370476422549702736644094563285051],y=integer,public:52887463659985761430091133772124690768677781799280413773044912238296204331699417469091296610220239433325238224933647139929492958281289467149794491179434949190055446809143849149086322387583189724300256430823699284964722221389756296695948072813949287172770178259455456837453570760294758645159814018680210877172,q=integer,shared:741802303617786660769426556982216255271020758647] forever forever -
-e41ac92a:tripe-dh:alice struct:[p=integer,shared:69775951038073580217048751187698556149910661999359201823421066000439190288124938297116840422332973903349265313226189724474672148172906743149961449018143681316055777549225333684417216672046201528908637006946721694566251047975893301628540057123962444434130461052652526277961662241061299058137499738575071867183,g=integer,shared:24031880137812767104513348688448999056754549625670167617628008814539123937598464069755252337842705625768270002772600104095116713027947418314704258588569425678035630653993833866258334547988915311887541947589468379164053328339235797437698686107421712042993209960764868024283667188725341401853595169622553906137,private=struct:[x=integer,private,burn:688117919585761159182535704066379347003922575359],y=integer,public:11968810422097828040138356493810753667079777301137513503524758653663206529933596206587409211665755594436008067034048682156890432817887506008283388939899943548428563491314269113784275369524966123025279618224821883359350680218152442710235178411332384857718603980372482853673813823181754321480786169027071242150,q=integer,shared:741802303617786660769426556982216255271020758647] forever forever -
-9f3a179b:tripe-dh-param struct:[p=integer,shared:69775951038073580217048751187698556149910661999359201823421066000439190288124938297116840422332973903349265313226189724474672148172906743149961449018143681316055777549225333684417216672046201528908637006946721694566251047975893301628540057123962444434130461052652526277961662241061299058137499738575071867183,g=integer,shared:24031880137812767104513348688448999056754549625670167617628008814539123937598464069755252337842705625768270002772600104095116713027947418314704258588569425678035630653993833866258334547988915311887541947589468379164053328339235797437698686107421712042993209960764868024283667188725341401853595169622553906137,q=integer,shared:741802303617786660769426556982216255271020758647] forever forever -
+bafb2876:tripe:carol struct:[p=integer,shared:69775951038073580217048751187698556149910661999359201823421066000439190288124938297116840422332973903349265313226189724474672148172906743149961449018143681316055777549225333684417216672046201528908637006946721694566251047975893301628540057123962444434130461052652526277961662241061299058137499738575071867183,g=integer,shared:24031880137812767104513348688448999056754549625670167617628008814539123937598464069755252337842705625768270002772600104095116713027947418314704258588569425678035630653993833866258334547988915311887541947589468379164053328339235797437698686107421712042993209960764868024283667188725341401853595169622553906137,private=struct:[x=integer,private,burn:73991155902179945261508509191547148355158375351],y=integer,public:37069178228377811166030071731849765678259693396714688962600218701483091198810506754964630489911246536883135042437408082007532504680074395403119352076064967233299326035447428716504321984168387644976048560331078815373900584178897334717028451802614990292165323963715739372593761778142664403111989271476234631785,q=integer,shared:741802303617786660769426556982216255271020758647] forever forever kx-group=dh
+b9839a99:tripe:bob struct:[p=integer,shared:69775951038073580217048751187698556149910661999359201823421066000439190288124938297116840422332973903349265313226189724474672148172906743149961449018143681316055777549225333684417216672046201528908637006946721694566251047975893301628540057123962444434130461052652526277961662241061299058137499738575071867183,g=integer,shared:24031880137812767104513348688448999056754549625670167617628008814539123937598464069755252337842705625768270002772600104095116713027947418314704258588569425678035630653993833866258334547988915311887541947589468379164053328339235797437698686107421712042993209960764868024283667188725341401853595169622553906137,private=struct:[x=integer,private,burn:375609211293082370476422549702736644094563285051],y=integer,public:52887463659985761430091133772124690768677781799280413773044912238296204331699417469091296610220239433325238224933647139929492958281289467149794491179434949190055446809143849149086322387583189724300256430823699284964722221389756296695948072813949287172770178259455456837453570760294758645159814018680210877172,q=integer,shared:741802303617786660769426556982216255271020758647] forever forever kx-group=dh
+e41ac92a:tripe:alice struct:[p=integer,shared:69775951038073580217048751187698556149910661999359201823421066000439190288124938297116840422332973903349265313226189724474672148172906743149961449018143681316055777549225333684417216672046201528908637006946721694566251047975893301628540057123962444434130461052652526277961662241061299058137499738575071867183,g=integer,shared:24031880137812767104513348688448999056754549625670167617628008814539123937598464069755252337842705625768270002772600104095116713027947418314704258588569425678035630653993833866258334547988915311887541947589468379164053328339235797437698686107421712042993209960764868024283667188725341401853595169622553906137,private=struct:[x=integer,private,burn:688117919585761159182535704066379347003922575359],y=integer,public:11968810422097828040138356493810753667079777301137513503524758653663206529933596206587409211665755594436008067034048682156890432817887506008283388939899943548428563491314269113784275369524966123025279618224821883359350680218152442710235178411332384857718603980372482853673813823181754321480786169027071242150,q=integer,shared:741802303617786660769426556982216255271020758647] forever forever kx-group=dh
+9f3a179b:tripe-param struct:[p=integer,shared:69775951038073580217048751187698556149910661999359201823421066000439190288124938297116840422332973903349265313226189724474672148172906743149961449018143681316055777549225333684417216672046201528908637006946721694566251047975893301628540057123962444434130461052652526277961662241061299058137499738575071867183,g=integer,shared:24031880137812767104513348688448999056754549625670167617628008814539123937598464069755252337842705625768270002772600104095116713027947418314704258588569425678035630653993833866258334547988915311887541947589468379164053328339235797437698686107421712042993209960764868024283667188725341401853595169622553906137,q=integer,shared:741802303617786660769426556982216255271020758647] forever forever kx-group=dh

diff --git a/t/keyring-beta-new b/t/keyring-beta-new
index ff32d9e..13c052c 100644 (file)
--- a/t/keyring-beta-new
+++ b/t/keyring-beta-new
@@ -1,4 +1,4 @@
-000f1070:tripe-ec-param struct:[curve=string,shared:secp160r1] forever forever bulk=iiv&serialization=constlen
-63803f04:tripe-ec:carol struct:[p=ec,public:0x42a11d34a1e19a69222a67c6ec29ff1d421cb021,0xc7d35a6dc9c330a09ee8e30680397b8bf51c29de,private=struct:[x=integer,private,burn:964893088925854502228477969935127891578649410999],curve=string,shared:secp160r1] forever forever bulk=iiv&serialization=constlen
-4045911b:tripe-ec:bob struct:[p=ec,public:0xcfc0b74fe1c4f30ced726bb70fbe4592ed8456ba,0x351d4dcbc200ccd3f3b6f4ecc112ecbf2043402d,private=struct:[x=integer,private,burn:333869955870933965311262832506583263321304092611],curve=string,shared:secp160r1] forever forever bulk=iiv&serialization=constlen
-e1a55f0e:tripe-ec:alice struct:[p=ec,public:0xce3bdc518066042b19083e2d27b0ded1915cb6b9,0xadef0e2006072f7bf038ef608e039a47e5767070,private=struct:[x=integer,private,burn:184161721501402669384082492238940360070520035996],curve=string,shared:secp160r1] forever forever bulk=iiv&serialization=constlen
+000f1070:tripe-param struct:[curve=string,shared:secp160r1] forever forever kx-group=ec&bulk=iiv&serialization=constlen
+63803f04:tripe:carol struct:[p=ec,public:0x42a11d34a1e19a69222a67c6ec29ff1d421cb021,0xc7d35a6dc9c330a09ee8e30680397b8bf51c29de,private=struct:[x=integer,private,burn:964893088925854502228477969935127891578649410999],curve=string,shared:secp160r1] forever forever kx-group=ec&bulk=iiv&serialization=constlen
+4045911b:tripe:bob struct:[p=ec,public:0xcfc0b74fe1c4f30ced726bb70fbe4592ed8456ba,0x351d4dcbc200ccd3f3b6f4ecc112ecbf2043402d,private=struct:[x=integer,private,burn:333869955870933965311262832506583263321304092611],curve=string,shared:secp160r1] forever forever kx-group=ec&bulk=iiv&serialization=constlen
+e1a55f0e:tripe:alice struct:[p=ec,public:0xce3bdc518066042b19083e2d27b0ded1915cb6b9,0xadef0e2006072f7bf038ef608e039a47e5767070,private=struct:[x=integer,private,burn:184161721501402669384082492238940360070520035996],curve=string,shared:secp160r1] forever forever kx-group=ec&bulk=iiv&serialization=constlen