server/tests.at, t/keyring-*: Rename test keyrings.

We're going to be playing games with these which will change which
groups they use, so naming them after the groups is silly.

Also switch the prime group to use a smaller field (catacomb-ll-160-1024
specifically) because the primality checking takes ages and we don't
actually need any security.

diff --git a/server/tests.at b/server/tests.at
index 649ff82a4228399ed610157af5e0dedc2650d309..f22ff062f5e2ae408b32bbbcdf504fce4b6141e7 100644 (file)
--- a/server/tests.at
+++ b/server/tests.at
@@ -271,7 +271,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
 
@@ -280,7 +280,7 @@ AT_CLEANUP
 
 AT_SETUP([server challenges])
 AT_KEYWORDS([chal])
-SETUPDIR([ec])
+SETUPDIR([alpha])
 
 WITH_TRIPE(, [
   ## A simple test.
@@ -338,7 +338,7 @@ 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],
@@ -352,7 +352,7 @@ AT_CLEANUP
 
 AT_SETUP([server services])
 AT_KEYWORDS([svc])
-SETUPDIR([ec])
+SETUPDIR([alpha])
 
 WITH_TRIPE(, [
 

diff --git a/t/Makefile.am b/t/Makefile.am
index 8b50ba39ac7ba11d3856be33fc5d79375c9ba1b0..73a7429ad51d2045eb02e4d91ce53070b5c84534 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -40,6 +40,6 @@ autotest_TESTS                += $(top_srcdir)/keys/tests.at
 ### Test files.
 
 ## Keyring files.
-EXTRA_DIST             += keyring-dh keyring-ec
+EXTRA_DIST             += keyring-alpha keyring-beta
 
 ###----- That's all, folks --------------------------------------------------

diff --git a/t/keyring-ec b/t/keyring-alpha
similarity index 100%
rename from t/keyring-ec
rename to t/keyring-alpha

diff --git a/t/keyring-beta b/t/keyring-beta
new file mode 100644 (file)
index 0000000..079e4d5
--- /dev/null
+++ b/t/keyring-beta
@@ -0,0 +1,3 @@
+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 -

diff --git a/t/keyring-dh b/t/keyring-dh
deleted file mode 100644 (file)
index dab09a0..0000000
--- a/t/keyring-dh
+++ /dev/null
@@ -1,3 +0,0 @@
-48b6ad10:tripe-dh:alice struct:[p=integer,shared:3113844893182469436423817481922802329154474934213986369565700235348098440269001480103560846535113493144522446351379349356211385191632945710341444495577638160076546999114567117877732507854868463110804063964212132228977417231690350182211790515961798314443291574015832300281633156990779527484905381392680532643288437519954295652416759988107781937077836044809781096660654460207183523575424301901443740349094152501352983589721328225459512044516684078781305909247963063040562914192132284695886353707336911126238203292592145886841905764429235683487108646920559740458905874135798982283901137307047131586817745416509850061963,g=integer,shared:1018599075350815414286530684646967825916370747779291600517646276513566802791874935821816063520500873842729343817973803895278528701892043836290994612088035311589900475691176610297248816678701309707300454643927577686742011376684351525767933769045470869869290385506108485669189456183746644562327923152628958690988304340204333382573235567919004822811151873260798098816157572583867825397056414990908538555039226503662448878536483457742053639607062687899859473980884756925814541061907505350254827583321961201313954703462583072253230646667723110441238195386606218014837851495231172030604130800244334912972408067680590879980,private=struct:[x=integer,private,burn:12925516279336617681749047875677910374808459601045692650183351252567],y=integer,public:2147252343272199332433093572624364150600733181272360401139826258684958424384279145806988150577635610222410097992967404883625424784184144642726033843635964577566618029602860768917644999454031707845407246999649272610738600396876995664510658888562522748574929429450804671881326957998945350853481175738068084140805913514578922673054211142426524306027661847782363099733057151725340675795636426193379444815434085929191423195852408127015244284862791758968887655610173981209464757816279326832989018651597986298264407327028105677106458198155062934722418627827294775769242447294469862143686827616893324924605673285776088348433,q=integer,shared:18749474022970964965792505501868745784157349746475161167020805104727] forever forever -
-0da37666:tripe-dh-param struct:[p=integer,shared:3113844893182469436423817481922802329154474934213986369565700235348098440269001480103560846535113493144522446351379349356211385191632945710341444495577638160076546999114567117877732507854868463110804063964212132228977417231690350182211790515961798314443291574015832300281633156990779527484905381392680532643288437519954295652416759988107781937077836044809781096660654460207183523575424301901443740349094152501352983589721328225459512044516684078781305909247963063040562914192132284695886353707336911126238203292592145886841905764429235683487108646920559740458905874135798982283901137307047131586817745416509850061963,g=integer,shared:1018599075350815414286530684646967825916370747779291600517646276513566802791874935821816063520500873842729343817973803895278528701892043836290994612088035311589900475691176610297248816678701309707300454643927577686742011376684351525767933769045470869869290385506108485669189456183746644562327923152628958690988304340204333382573235567919004822811151873260798098816157572583867825397056414990908538555039226503662448878536483457742053639607062687899859473980884756925814541061907505350254827583321961201313954703462583072253230646667723110441238195386606218014837851495231172030604130800244334912972408067680590879980,q=integer,shared:18749474022970964965792505501868745784157349746475161167020805104727] forever forever -
-61e17f7f:tripe-dh:bob struct:[p=integer,shared:3113844893182469436423817481922802329154474934213986369565700235348098440269001480103560846535113493144522446351379349356211385191632945710341444495577638160076546999114567117877732507854868463110804063964212132228977417231690350182211790515961798314443291574015832300281633156990779527484905381392680532643288437519954295652416759988107781937077836044809781096660654460207183523575424301901443740349094152501352983589721328225459512044516684078781305909247963063040562914192132284695886353707336911126238203292592145886841905764429235683487108646920559740458905874135798982283901137307047131586817745416509850061963,g=integer,shared:1018599075350815414286530684646967825916370747779291600517646276513566802791874935821816063520500873842729343817973803895278528701892043836290994612088035311589900475691176610297248816678701309707300454643927577686742011376684351525767933769045470869869290385506108485669189456183746644562327923152628958690988304340204333382573235567919004822811151873260798098816157572583867825397056414990908538555039226503662448878536483457742053639607062687899859473980884756925814541061907505350254827583321961201313954703462583072253230646667723110441238195386606218014837851495231172030604130800244334912972408067680590879980,private=struct:[x=integer,private,burn:12163975397932741738101903752094019200883658888161942333037284423031],y=integer,public:2538255328091619690225041752206252822929236727195947187581419491623201884002355667551139784541831040415557604602120565060968907431257786395895425685969565995115996571242707726537378860889344307644597579158919280736417138267421099827884009251003627252120392588585786096385356952091997018391656120535654089409855941438084834572780824414557902182373896449891320111559217121175917953476059534921862360583559483956764373559698591559823297030130916665584335677626307093125894088146636164355754864287500475276281337104514246279631170366631990830234749904810761492147086966825270571014875840270855862091250646671726392963239,q=integer,shared:18749474022970964965792505501868745784157349746475161167020805104727] forever forever -