Skip to content
Snippets Groups Projects
Commit 2988fb0f authored by Benjamin Wenger's avatar Benjamin Wenger
Browse files

fixed tests

parent e87b15da
No related branches found
No related tags found
No related merge requests found
......@@ -7,7 +7,7 @@ import (
func TestGetDefaultCMIX(t *testing.T) {
c := GetDefaultCMIX()
if c.RoundTries != 3 || c.Timeout != 25*time.Second {
if c.RoundTries != 10 || c.Timeout != 25*time.Second {
t.Errorf("GetDefaultCMIX did not return expected values")
}
}
......@@ -42,12 +42,11 @@ func NewStore(kv *versioned.KV, grp *cyclic.Group, privKeys []*cyclic.Int) (*Sto
}
for _, key := range privKeys {
keyCopy := key.DeepCopy()
pubkey := grp.ExpG(key, grp.NewInt(1))
fp := auth.MakeRequestFingerprint(pubkey)
s.fingerprints[fp] = fingerprint{
Type: General,
PrivKey: keyCopy,
PrivKey: key,
Request: nil,
}
}
......@@ -72,12 +71,11 @@ func LoadStore(kv *versioned.KV, grp *cyclic.Group, privKeys []*cyclic.Int) (*St
}
for _, key := range privKeys {
keyCopy := key.DeepCopy()
pubkey := grp.ExpG(key, grp.NewInt(1))
fp := auth.MakeRequestFingerprint(pubkey)
s.fingerprints[fp] = fingerprint{
Type: General,
PrivKey: keyCopy,
PrivKey: key,
Request: nil,
}
}
......
......@@ -18,10 +18,12 @@ import (
// Happy path.
func TestNewStore(t *testing.T) {
kv := versioned.NewKV(make(ekv.Memstore))
grp := cyclic.NewGroup(large.NewInt(173), large.NewInt(0))
grp := cyclic.NewGroup(large.NewInt(173), large.NewInt(2))
privKeys := make([]*cyclic.Int, 10)
pubKeys := make([]*cyclic.Int, 10)
for i := range privKeys {
privKeys[i] = grp.NewInt(rand.Int63n(172))
pubKeys[i] = grp.ExpG(privKeys[i],grp.NewInt(1))
}
store, err := NewStore(kv, grp, privKeys)
......@@ -30,8 +32,12 @@ func TestNewStore(t *testing.T) {
}
for i, key := range privKeys {
if store.fingerprints[auth.MakeRequestFingerprint(key)].PrivKey != key {
t.Errorf("Key not found in map (%d): %s", i, key.Text(10))
rq, ok := store.fingerprints[auth.MakeRequestFingerprint(pubKeys[i])]
if !ok {
t.Errorf("Key not found in map (%d): %s", i, pubKeys[i].Text(16))
}else if rq.PrivKey.Cmp(key)!=0{
t.Errorf("Key found in map (%d) does not match private: " +
"%s vs %s", i, key.Text(10), rq.PrivKey.Text(10))
}
}
}
......@@ -64,15 +70,6 @@ func TestLoadStore(t *testing.T) {
t.Errorf("LoadStore() returned an error: %+v", err)
}
s.requests = map[id.ID]*request{}
s.fingerprints[sr.fingerprint] = fingerprint{
Type: Specific,
Request: &request{
rt: Sent,
sent: sr,
},
}
if !reflect.DeepEqual(s, store) {
t.Errorf("LoadStore() returned incorrect Store."+
"\n\texpected: %+v\n\treceived: %+v", s, store)
......@@ -181,7 +178,8 @@ func TestStore_AddReceived_PartnerAlreadyExistsError(t *testing.T) {
func TestStore_GetFingerprint_GeneralFingerprintType(t *testing.T) {
s, _, privKeys := makeTestStore(t)
fp := auth.MakeRequestFingerprint(privKeys[0])
pubkey := s.grp.ExpG(privKeys[0],s.grp.NewInt(1))
fp := auth.MakeRequestFingerprint(pubkey)
fpType, request, key, err := s.GetFingerprint(fp)
if err != nil {
t.Errorf("GetFingerprint() returned an error: %+v", err)
......@@ -194,6 +192,7 @@ func TestStore_GetFingerprint_GeneralFingerprintType(t *testing.T) {
t.Errorf("GetFingerprint() returned incorrect request."+
"\n\texpected: %+v\n\treceived: %+v", nil, request)
}
if key.Cmp(privKeys[0]) == -2 {
t.Errorf("GetFingerprint() returned incorrect key."+
"\n\texpected: %s\n\treceived: %s", privKeys[0].Text(10), key.Text(10))
......
......@@ -158,16 +158,11 @@ func (s *Store) AddPartner(partnerID *id.ID, partnerPubKey, myPrivKey *cyclic.In
s.mux.Lock()
defer s.mux.Unlock()
myPubKey := s.grp.ExpG(myPrivKey,s.grp.NewInt(1))
baseKey := s.grp.Exp(partnerPubKey,myPrivKey,s.grp.NewInt(1))
jww.INFO.Printf("Adding Partner %s:\n\tMy Private Key: %s" +
"\n\tMy Public Key: %s\n\tPartner Public Key: %s\n\tBase Key: %s",
"\n\tPartner Public Key: %s",
partnerID,
myPrivKey.TextVerbose(16, 0),
myPubKey.TextVerbose(16, 0),
partnerPubKey.TextVerbose(16, 0),
baseKey.TextVerbose(16, 0))
partnerPubKey.TextVerbose(16, 0))
if _, ok := s.managers[*partnerID]; ok {
return errors.New("Cannot overwrite existing partner")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment