allow cer file like crt file

JumpMind · Jul 26, 2023 · 225784f · 225784f
1 parent 6b1ee1e
commit 225784f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/symmetric-assemble/src/asciidoc/manage/security.ad b/symmetric-assemble/src/asciidoc/manage/security.ad
@@ -7,7 +7,7 @@ The Security panel manages the SSL/TLS certificates and keys.
 
 The server certificate and private key are used for encrypting the HTTPS transport of data.  The certificate can also be used to verify a node when client authentication is enabled.  The server certificate is stored in a protected keystore named `security/keystore`.
 
-Import certificate and key from file:: Upload a file containing the server certificate and private key, which can then be imported.  If the file is a keystore with multiple entries, the user is prompted to select one from the list.  If the file is a protected keystore, the user is prompted for the password.  File types supported are PEM, CRT, PFX, and P12, with support for PKCS 1, PKCS 8, and PKCS 12 standards.
+Import certificate and key from file:: Upload a file containing the server certificate and private key, which can then be imported.  If the file is a keystore with multiple entries, the user is prompted to select one from the list.  If the file is a protected keystore, the user is prompted for the password.  File types supported are PEM, CRT, CER, PFX, and P12, with support for PKCS 1, PKCS 8, and PKCS 12 standards.
 Backup certificate key to file:: Backup the current server certificate and private key to a PEM-encoded text file.
 Export certificate to file:: Export the current certificate to a PEM-encoded text file.
 Generate self-signed certificate:: Generate a new key and self-signed certificate.

diff --git a/symmetric-util/src/main/java/org/jumpmind/security/BouncyCastleSecurityService.java b/symmetric-util/src/main/java/org/jumpmind/security/BouncyCastleSecurityService.java
@@ -208,7 +208,7 @@ protected Entry createSslCert(byte[] content, String fileType, String alias, Str
                     chain = new Certificate[1];
                     chain[0] = store.getCertificate(alias);
                 }
-            } else if (fileType.equalsIgnoreCase("pem") || fileType.equalsIgnoreCase("crt")) {
+            } else if (fileType.equalsIgnoreCase("pem") || fileType.equalsIgnoreCase("crt") || fileType.equalsIgnoreCase("cer")) {
                 List<Certificate> certs = new ArrayList<Certificate>();
                 BufferedReader reader = new BufferedReader(new InputStreamReader(is));
                 String line = null;