Merge branch 'master' of github.com:symbolicsoft/noiseexplorer

symbolicsoft · Aug 19, 2023 · cdc255e · cdc255e
2 parents ce74d65 + fa98a6d
commit cdc255e
Show file tree

Hide file tree

Showing 119 changed files with 357 additions and 119 deletions.
diff --git a/implementations/go/I1K.noise.go b/implementations/go/I1K.noise.go
@@ -242,7 +242,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/I1K1.noise.go b/implementations/go/I1K1.noise.go
@@ -242,7 +242,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/I1N.noise.go b/implementations/go/I1N.noise.go
@@ -240,7 +240,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/I1X.noise.go b/implementations/go/I1X.noise.go
@@ -240,7 +240,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/I1X1.noise.go b/implementations/go/I1X1.noise.go
@@ -240,7 +240,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/IK.noise.go b/implementations/go/IK.noise.go
@@ -241,7 +241,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/IK1.noise.go b/implementations/go/IK1.noise.go
@@ -242,7 +242,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/IKpsk1.noise.go b/implementations/go/IKpsk1.noise.go
@@ -241,7 +241,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/IKpsk2.noise.go b/implementations/go/IKpsk2.noise.go
@@ -241,7 +241,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/IN.noise.go b/implementations/go/IN.noise.go
@@ -239,7 +239,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/INpsk1.noise.go b/implementations/go/INpsk1.noise.go
@@ -239,7 +239,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/INpsk2.noise.go b/implementations/go/INpsk2.noise.go
@@ -239,7 +239,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/IX.noise.go b/implementations/go/IX.noise.go
@@ -239,7 +239,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/IX1.noise.go b/implementations/go/IX1.noise.go
@@ -240,7 +240,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/IXpsk2.noise.go b/implementations/go/IXpsk2.noise.go
@@ -239,7 +239,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/K.noise.go b/implementations/go/K.noise.go
@@ -239,7 +239,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/K1K.noise.go b/implementations/go/K1K.noise.go
@@ -243,7 +243,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/K1K1.noise.go b/implementations/go/K1K1.noise.go
@@ -243,7 +243,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/K1N.noise.go b/implementations/go/K1N.noise.go
@@ -242,7 +242,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/K1X.noise.go b/implementations/go/K1X.noise.go
@@ -242,7 +242,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/K1X1.noise.go b/implementations/go/K1X1.noise.go
@@ -242,7 +242,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/KK.noise.go b/implementations/go/KK.noise.go
@@ -242,7 +242,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/KK1.noise.go b/implementations/go/KK1.noise.go
@@ -242,7 +242,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/KKpsk0.noise.go b/implementations/go/KKpsk0.noise.go
@@ -242,7 +242,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/KKpsk2.noise.go b/implementations/go/KKpsk2.noise.go
@@ -242,7 +242,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/KN.noise.go b/implementations/go/KN.noise.go
@@ -241,7 +241,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/KNpsk0.noise.go b/implementations/go/KNpsk0.noise.go
@@ -241,7 +241,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/KNpsk2.noise.go b/implementations/go/KNpsk2.noise.go
@@ -241,7 +241,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/KX.noise.go b/implementations/go/KX.noise.go
@@ -241,7 +241,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/KX1.noise.go b/implementations/go/KX1.noise.go
@@ -242,7 +242,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/KXpsk2.noise.go b/implementations/go/KXpsk2.noise.go
@@ -241,7 +241,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/Kpsk0.noise.go b/implementations/go/Kpsk0.noise.go
@@ -239,7 +239,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/N.noise.go b/implementations/go/N.noise.go
@@ -238,7 +238,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/NK.noise.go b/implementations/go/NK.noise.go
@@ -241,7 +241,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/NK1.noise.go b/implementations/go/NK1.noise.go
@@ -241,7 +241,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }
 

diff --git a/implementations/go/NKpsk0.noise.go b/implementations/go/NKpsk0.noise.go
@@ -241,7 +241,9 @@ func decryptWithAd(cs *cipherstate, ad []byte, ciphertext []byte) (*cipherstate,
  return cs, []byte{}, false, err
  }
  valid, ad, plaintext := decrypt(cs.k, cs.n, ad, ciphertext)
- cs = setNonce(cs, incrementNonce(cs.n))
+ if valid {
+ cs = setNonce(cs, incrementNonce(cs.n))
+ }
  return cs, plaintext, valid, err
 }