diff options
| -rw-r--r-- | includes/keygen.php | 4 | ||||
| -rw-r--r-- | www/keygenIE.js | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/includes/keygen.php b/includes/keygen.php index 1cb7738..b489640 100644 --- a/includes/keygen.php +++ b/includes/keygen.php @@ -96,6 +96,10 @@ if (array_key_exists('HTTP_USER_AGENT',$_SERVER) && <?=_('Could not generate certificate request. Probably you need to '. 'choose a different algorithm.')?> </p> + <p id="createRequestErrorConfirmDialogue" style="display:none"> + <?=_('Could not generate certificate request. Please confirm the '. + 'dialogue if you are asked if you want to generate the key.')?> + </p> <p id="createRequestError" style="display:none"> <?=_('Could not generate certificate request.')?> </p> diff --git a/www/keygenIE.js b/www/keygenIE.js index e546f62..31baa25 100644 --- a/www/keygenIE.js +++ b/www/keygenIE.js @@ -65,6 +65,7 @@ var noActiveX = document.getElementById("noActiveX"); var generatingKeyNotice = document.getElementById("generatingKeyNotice"); var createRequestErrorChooseAlgorithm = document.getElementById("createRequestErrorChooseAlgorithm"); + var createRequestErrorConfirmDialogue = document.getElementById("createRequestErrorConfirmDialogue"); var createRequestError = document.getElementById("createRequestError"); var invalidKeySizeError = document.getElementById("invalidKeySizeError"); var unsupportedPlatformError = document.getElementById("unsupportedPlatformError"); @@ -342,7 +343,6 @@ } form.style.display = ""; - //algorithmParagraph.style.display = "none"; algorithm.disabled = true; noActiveX.style.display = "none"; } catch (e) { @@ -472,8 +472,6 @@ if (getStepSigKeyLength()) { keySize.setAttribute("step", getStepSigKeyLength()); } - //keySize.setAttribute("value", alg.DefaultLength); - //keySize.value = ""+alg.DefaultLength; // ugly, but buggy otherwise if done with text nodes keySizeMin.innerHTML = getMinSigKeyLength(); @@ -534,7 +532,6 @@ } return getAlgorithmList(); - //return getKeySizeLimits(); } @@ -577,7 +574,11 @@ csr.value = cenroll.createPKCS10("", "1.3.6.1.5.5.7.3.2"); form.submit(); } catch (e) { - showError(createRequestError.innerHTML, e); + if (e.number === -2147023673) { + showError(createRequestErrorConfirmDialogue.innerHTML, e); + } else { + showError(createRequestError.innerHTML, e); + } } generatingKeyNotice.style.display = "none"; @@ -604,7 +605,6 @@ securityLevel.onchange = refreshSecurityLevel; provider.onchange = getAlgorithmList; - //provider.onchange = getKeySizeLimits; algorithm.onchange = getKeySizeLimits; genReq.onclick = createCSR; |