From f401b0c4f487a2a65f509040ea5e00aca134f29a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Fri, 1 Aug 2014 17:09:20 +0200 Subject: [PATCH] Typo fix challange -> challenge --- .../gigi/pages/account/IssueCertificateForm.java | 12 ++++++------ .../gigi/pages/account/RequestCertificate.templ | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java b/src/org/cacert/gigi/pages/account/IssueCertificateForm.java index cf10c612..694652f9 100644 --- a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java +++ b/src/org/cacert/gigi/pages/account/IssueCertificateForm.java @@ -54,12 +54,12 @@ public class IssueCertificateForm extends Form { private final static Template tIni = new Template(MailCertificateAdd.class.getResource("RequestCertificate.templ")); - String spkacChallange; + String spkacChallenge; public IssueCertificateForm(HttpServletRequest hsr) { super(hsr); u = Page.getUser(hsr); - spkacChallange = RandomToken.generateToken(16); + spkacChallenge = RandomToken.generateToken(16); } Certificate result; @@ -94,14 +94,14 @@ public class IssueCertificateForm extends Form { String cleanedSPKAC = spkac.replaceAll("[\r\n]", ""); byte[] data = Base64.getDecoder().decode(cleanedSPKAC); SPKAC parsed = new SPKAC(data); - if ( !parsed.getChallenge().equals(spkacChallange)) { - throw new GigiApiException("Challange mismatch"); + if ( !parsed.getChallenge().equals(spkacChallenge)) { + throw new GigiApiException("Challenge mismatch"); } checkKeyStrength(parsed.getPubkey(), out); String sign = getSignatureAlgorithm(data); out.println("
digest: " + sign + "
"); - // spkacChallange + // spkacChallenge this.csr = "SPKAC=" + cleanedSPKAC; this.csrType = CSRType.SPKAC; @@ -170,7 +170,7 @@ public class IssueCertificateForm extends Form { HashMap vars2 = new HashMap(vars); vars2.put("csrf", getCSRFToken()); vars2.put("csrf_name", getCsrfFieldName()); - vars2.put("spkacChallange", spkacChallange); + vars2.put("spkacChallenge", spkacChallenge); tIni.output(out, l, vars2); return; } else { diff --git a/src/org/cacert/gigi/pages/account/RequestCertificate.templ b/src/org/cacert/gigi/pages/account/RequestCertificate.templ index b67554c2..d41a60a5 100644 --- a/src/org/cacert/gigi/pages/account/RequestCertificate.templ +++ b/src/org/cacert/gigi/pages/account/RequestCertificate.templ @@ -18,7 +18,7 @@ -

+
-- 2.39.2