summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--magic/Magdir/ssl11
1 files changed, 11 insertions, 0 deletions
diff --git a/magic/Magdir/ssl b/magic/Magdir/ssl
index 5d5daeea..9e59ef6a 100644
--- a/magic/Magdir/ssl
+++ b/magic/Magdir/ssl
@@ -1,3 +1,8 @@
+
+#------------------------------------------------------------------------------
+# $File: ssl,v 1.3 2017/01/18 14:59:19 christos Exp $
+# ssl: file(1) magic for SSL file formats
+
# Type: OpenSSL certificates/key files
# From: Nicolas Collignon <tsointsoin@gmail.com>
@@ -6,3 +11,9 @@
0 string -----BEGIN\ RSA\ PRIVATE PEM RSA private key
0 string -----BEGIN\ DSA\ PRIVATE PEM DSA private key
0 string -----BEGIN\ EC\ PRIVATE PEM EC private key
+
+# From Luc Gommans
+# OpenSSL enc file (recognized by a magic string preceding the password's salt)
+0 string Salted__ openssl enc'd data with salted password
+# Using the -a or -base64 option, OpenSSL will base64-encode the data.
+0 string U2FsdGVkX19 openssl enc'd data with salted password, base64 encoded