fix: typo in challenge

Change-Id: I758d9d610b05a111381121e0bf46bd14febf5e4e

diff --git a/src/club/wpia/gigi/crypto/SPKAC.java b/src/club/wpia/gigi/crypto/SPKAC.java
index 77c7e2c069d0bdd7dbc31f9a0a2dd82cc49f461b..359f5127408115d5e174ef0f7566eaa40f2d3a1d 100644 (file)
--- a/src/club/wpia/gigi/crypto/SPKAC.java
+++ b/src/club/wpia/gigi/crypto/SPKAC.java
@@ -73,9 +73,9 @@ public class SPKAC {
         return pubkey;
     }
 
-    public SPKAC(X509Key pubkey, String challange) {
+    public SPKAC(X509Key pubkey, String challenge) {
         this.pubkey = pubkey;
-        challenge = challange;
+        this.challenge = challenge;
     }
 
     public byte[] getEncoded(Signature sign) throws GeneralSecurityException, IOException {

diff --git a/tests/club/wpia/gigi/crypto/TestSPKAC.java b/tests/club/wpia/gigi/crypto/TestSPKAC.java
index 7f72242b901a18d05b20f3d540629e79b93c450c..c12ffd198ce213ee749b167458946f75366daac2 100644 (file)
--- a/tests/club/wpia/gigi/crypto/TestSPKAC.java
+++ b/tests/club/wpia/gigi/crypto/TestSPKAC.java
@@ -60,7 +60,7 @@ public class TestSPKAC {
         pkg.initialize(1024);
         KeyPair kp = pkg.generateKeyPair();
 
-        SPKAC s = new SPKAC((X509Key) kp.getPublic(), "this is a even bigger challange");
+        SPKAC s = new SPKAC((X509Key) kp.getPublic(), "this is a even bigger challenge");
         Signature sign = Signature.getInstance("SHA512withRSA");
         sign.initSign(kp.getPrivate());
 

diff --git a/tests/club/wpia/gigi/pages/account/TestCertificateAdd.java b/tests/club/wpia/gigi/pages/account/TestCertificateAdd.java
index 9b3a7638cd9125dbf6acea1fe6df0dbd69a01488..854cca7a54ba16daabdf64b5c730c4e63da50471 100644 (file)
--- a/tests/club/wpia/gigi/pages/account/TestCertificateAdd.java
+++ b/tests/club/wpia/gigi/pages/account/TestCertificateAdd.java
@@ -289,7 +289,7 @@ public class TestCertificateAdd extends ClientTest {
         return uc;
     }
 
-    protected String testSPKAC(boolean correctChallange) throws GeneralSecurityException, IOException {
+    protected String testSPKAC(boolean correctChallenge) throws GeneralSecurityException, IOException {
         HttpURLConnection uc = (HttpURLConnection) ncert.openConnection();
         uc.setRequestProperty("Cookie", cookie);
         String s = IOUtils.readURL(uc);
@@ -297,13 +297,13 @@ public class TestCertificateAdd extends ClientTest {
         csrf = extractPattern(s, Pattern.compile("<input [^>]*name='csrf' [^>]*value='([^']*)'>"));
         String challenge = extractPattern(s, Pattern.compile("<keygen [^>]*name=\"SPKAC\" [^>]*challenge=\"([^\"]*)\"/>"));
 
-        SPKAC spk = new SPKAC((X509Key) kp.getPublic(), challenge + (correctChallange ? "" : "b"));
+        SPKAC spk = new SPKAC((X509Key) kp.getPublic(), challenge + (correctChallenge ? "" : "b"));
         Signature sign = Signature.getInstance("SHA512WithRSA");
         sign.initSign(kp.getPrivate());
         try {
             String[] res = fillOutFormDirect("SPKAC=" + URLEncoder.encode(Base64.getEncoder().encodeToString(spk.getEncoded(sign)), "UTF-8"));
-            if ( !correctChallange) {
-                fail("Should not succeed with wrong challange.");
+            if ( !correctChallenge) {
+                fail("Should not succeed with wrong challenge.");
             }
             assertArrayEquals(new String[] {
                     "client", CertificateRequest.DEFAULT_CN, "", Digest.SHA512.toString()

diff --git a/util-testing/club/wpia/gigi/pages/Manager.java b/util-testing/club/wpia/gigi/pages/Manager.java
index af05ab49bf1d9213cc05ebd5811a6a77cb917490..bd254d502155352bdb79ff49af2c00e90cfb31f6 100644 (file)
--- a/util-testing/club/wpia/gigi/pages/Manager.java
+++ b/util-testing/club/wpia/gigi/pages/Manager.java
@@ -402,13 +402,13 @@ public class Manager extends Page {
                 KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
                 kpg.initialize(4096);
                 KeyPair kp = kpg.generateKeyPair();
-                SPKAC s = new SPKAC((X509Key) kp.getPublic(), "challange");
+                SPKAC s = new SPKAC((X509Key) kp.getPublic(), "challenge");
                 Signature sign = Signature.getInstance("SHA512withRSA");
                 sign.initSign(kp.getPrivate());
 
                 byte[] res = s.getEncoded(sign);
 
-                CertificateRequest cr = new CertificateRequest(new AuthorizationContext(u, u), Base64.getEncoder().encodeToString(res), "challange");
+                CertificateRequest cr = new CertificateRequest(new AuthorizationContext(u, u), Base64.getEncoder().encodeToString(res), "challenge");
                 cr.update(CertificateRequest.DEFAULT_CN, Digest.SHA512.toString(), "client", null, "", "email:" + u.getEmail());
                 Certificate draft = cr.draft();
                 draft.issue(null, "2y", u).waitFor(10000);