more magic fixes

diff --git a/magic/Magdir/apple b/magic/Magdir/apple
index 093ac0aba40def3674db68f05735671ae06cae0d..4a593ea221ec0a7587eac3cfe49e989ad80084c7 100644 (file)
--- a/magic/Magdir/apple
+++ b/magic/Magdir/apple
@@ -226,3 +226,7 @@
 0      belong          0xfade0cc1      Mac OS X Detached Code Signature
 >8     belong          >1                      (%d elements)
 >4     belong          x                       - %d bytes
+
+# From: "Nelson A. de Oliveira" <naoliv@gmail.com>
+# .vdi
+4      string innotek\ VirtualBox\ Disk\ Image %s

diff --git a/magic/Magdir/archive b/magic/Magdir/archive
index dae81d918f6efeeaa26f2033547d79afa8737ad3..0b3a9ba92bda43c62d6ff4e0742620d7422d2fa8 100644 (file)
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -744,3 +744,7 @@
 0      string  xar!            xar archive
 >6     beshort x               - version %ld
 
+# From: "Nelson A. de Oliveira" <naoliv@gmail.com>
+# .kgb
+0      string KGB_arch         KGB Archiver file
+>10    string x                with compression level %.1s

diff --git a/magic/Magdir/java b/magic/Magdir/java
index f7d65988cecefcb1f64b7e0c5d6fd26ac33953a1..971b72ceb3a4d95e72e60d21592355ed9eeceee5 100644 (file)
--- a/magic/Magdir/java
+++ b/magic/Magdir/java
@@ -8,6 +8,10 @@
 0      beshort         0xaced          Java serialization data
 >2     beshort         >0x0004         \b, version %d
 
+0      belong          0xfeedfeed      Java KeyStore
+
+0      belong          0xcececece      Java JCE KeyStore
+
 # Dalvik .dex format. http://retrodev.com/android/dexformat.html
 # From <mkf@google.com> "Mike Fleming"
 0      string  dex\n

diff --git a/magic/magic.mime b/magic/magic.mime
index 3d58e269f8d783bb7ef174896231ed7d76decb9d..dfa62de4b8d81cae0d0bc49cbbf767f0b0059db3 100644 (file)
--- a/magic/magic.mime
+++ b/magic/magic.mime
@@ -121,6 +121,10 @@
 
 38     string          \<\!DOCTYPE\040svg      image/svg+xml
 
+0      belong          0xfeedfeed      application/x-java-keystore
+
+0      belong          0xcececece      application/x-java-jce-keystore
+
 
 # xml
 0      string          \<?xml                  text/xml