Added verify button to DViewCsr

kaikramer · Dec 23, 2023 · 5c79281 · 5c79281
1 parent d73f1c3
commit 5c79281
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 1 deletion.
diff --git a/kse/src/org/kse/gui/dialogs/DViewCsr.java b/kse/src/org/kse/gui/dialogs/DViewCsr.java
@@ -38,6 +38,7 @@
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JSeparator;
 import javax.swing.JTextField;
 
@@ -89,6 +90,7 @@ public class DViewCsr extends JEscDialog {
     private JTextField jtfChallenge;
     private JLabel jlUnstructuredName;
     private JTextField jtfUnstructuredName;
+    private JButton jbVerify;
     private JButton jbExtensions;
     private JButton jbPem;
     private JButton jbAsn1;
@@ -167,6 +169,10 @@ private void initComponents() throws CryptoException {
         jtfUnstructuredName.setEditable(false);
         jtfUnstructuredName.setToolTipText(res.getString("DViewCsr.jtfUnstructuredName.tooltip"));
 
+        jbVerify = new JButton(res.getString("DViewCsr.jbVerify.text"));
+        PlatformUtil.setMnemonic(jbVerify, res.getString("DViewCsr.jbVerify.mnemonic").charAt(0));
+        jbVerify.setToolTipText(res.getString("DViewCsr.jbVerify.tooltip"));
+
         jbExtensions = new JButton(res.getString("DViewCsr.jbExtensions.text"));
         PlatformUtil.setMnemonic(jbExtensions, res.getString("DViewCsr.jbExtensions.mnemonic").charAt(0));
         jbExtensions.setToolTipText(res.getString("DViewCsr.jbExtensions.tooltip"));
@@ -196,7 +202,8 @@ private void initComponents() throws CryptoException {
         pane.add(jtfChallenge, "wrap");
         pane.add(jlUnstructuredName, "");
         pane.add(jtfUnstructuredName, "wrap para");
-        pane.add(jbExtensions, "spanx, split");
+        pane.add(jbVerify, "spanx, split");
+        pane.add(jbExtensions, "");
         pane.add(jbPem, "");
         pane.add(jbAsn1, "wrap");
         pane.add(new JSeparator(), "spanx, growx, wrap 15:push");
@@ -213,6 +220,15 @@ private void initComponents() throws CryptoException {
             }
         });
 
+        jbVerify.addActionListener(evt -> {
+            try {
+                CursorUtil.setCursorBusy(DViewCsr.this);
+                verifyPressed();
+            } finally {
+                CursorUtil.setCursorFree(DViewCsr.this);
+            }
+        });
+
         jbExtensions.addActionListener(evt -> {
             try {
                 CursorUtil.setCursorBusy(DViewCsr.this);
@@ -353,6 +369,20 @@ private PublicKey getPkcs10PublicKey() throws CryptoException {
         }
     }
 
+    private void verifyPressed() {
+        try {
+            if (Pkcs10Util.verifyCsr(pkcs10Csr)) {
+                JOptionPane.showMessageDialog(this, res.getString("DViewCsr.VerifyOK.message"),
+                                              res.getString("DViewCsr.Verify.title"), JOptionPane.INFORMATION_MESSAGE);
+            } else {
+                JOptionPane.showMessageDialog(this, res.getString("DViewCsr.NoVerify.message"),
+                                              res.getString("DViewCsr.Verify.title"), JOptionPane.WARNING_MESSAGE);
+            }
+        } catch (CryptoException e) {
+            DError.displayError(this, e);
+        }
+    }
+
     private void extensionsPressed() {
         X509ExtensionSet x509ExtensionSet = Pkcs10Util.getExtensions(pkcs10Csr);
 

diff --git a/kse/src/org/kse/gui/dialogs/resources.properties b/kse/src/org/kse/gui/dialogs/resources.properties
@@ -433,6 +433,9 @@ DViewCsr.jbAsn1.tooltip                 = Display ASN.1 dump for CSR
 DViewCsr.jbExtensions.mnemonic          = E
 DViewCsr.jbExtensions.text              = Extensions
 DViewCsr.jbExtensions.tooltip           = Display the CSR's extensions
+DViewCsr.jbVerify.mnemonic              = V
+DViewCsr.jbVerify.text                  = Verify
+DViewCsr.jbVerify.tooltip               = Verify the CSR's signature
 DViewCsr.jbOK.text                      = OK
 DViewCsr.jbPem.mnemonic                 = P
 DViewCsr.jbPem.text                     = PEM
@@ -453,6 +456,9 @@ DViewCsr.jtfPublicKey.text              = {0} {1} bits
 DViewCsr.jtfPublicKey.tooltip           = CSR's public key algorithm
 DViewCsr.jtfSignatureAlgorithm.tooltip  = Signature algorithm used to sign CSR
 DViewCsr.jtfUnstructuredName.tooltip    = Optional Company Name for compatibility with OpenSSL (PKCS#10 attribute "unstructuredName")
+DViewCsr.Verify.title                   = Signature Verification Result
+DViewCsr.VerifyOK.message               = Signature is valid
+DViewCsr.NoVerify.message               = Signature is invalid
 
 DViewDHParameters.ChooseExportFile.button     = Choose
 DViewDHParameters.ExportPem.Title             = Export PEM

diff --git a/kse/src/org/kse/gui/dialogs/resources_de.properties b/kse/src/org/kse/gui/dialogs/resources_de.properties
@@ -569,3 +569,6 @@ RevokedCertsTableHeadRend.SerialNumberColumn.tooltip   = Seriennummer des gesper
 
 RevokedCertsTableModel.RevocationDateColumn = Datum der Sperrung
 RevokedCertsTableModel.SerialNumberColumn   = Seriennummer
+DViewCsr.NoVerify.message=Signatur ist ung\u00FCltig
+DViewCsr.Verify.title=Ergebnis der Signaturpr\u00FCfung
+DViewCsr.VerifyOK.message=Signatur ist g\u00FCltig
diff --git a/kse/src/org/kse/version/JavaVersion.java b/kse/src/org/kse/version/JavaVersion.java
@@ -72,6 +72,7 @@ public class JavaVersion implements Comparable<Object> {
     public static final JavaVersion JRE_VERSION_21 = new JavaVersion("21");
     public static final JavaVersion JRE_VERSION_22 = new JavaVersion("22");
     public static final JavaVersion JRE_VERSION_23 = new JavaVersion("23");
+    public static final JavaVersion JRE_VERSION_24 = new JavaVersion("24");
 
     /**
      * Construct a JavaVersion object for the current Java environment.