diff options
| author | mpp <mpp@FreeBSD.org> | 1996-01-23 12:40:36 +0000 |
|---|---|---|
| committer | mpp <mpp@FreeBSD.org> | 1996-01-23 12:40:36 +0000 |
| commit | 7e3b21a299153c576c06d09f9b4dabd3063315f8 (patch) | |
| tree | 6cc6a8b30063115a67cc5c6db8c16fd98f1c4d77 /usr.bin/file/Magdir | |
| parent | bed6c740ce8181de2bc93f03538f1e7a09689ece (diff) | |
| download | FreeBSD-src-7e3b21a299153c576c06d09f9b4dabd3063315f8.zip FreeBSD-src-7e3b21a299153c576c06d09f9b4dabd3063315f8.tar.gz | |
Merged changes to resolve conflicts with file 3.19 import.
Diffstat (limited to 'usr.bin/file/Magdir')
| -rw-r--r-- | usr.bin/file/Magdir/pgp | 13 | ||||
| -rw-r--r-- | usr.bin/file/Magdir/zyxel | 17 |
2 files changed, 18 insertions, 12 deletions
diff --git a/usr.bin/file/Magdir/pgp b/usr.bin/file/Magdir/pgp index eb10f21..aaff0e9 100644 --- a/usr.bin/file/Magdir/pgp +++ b/usr.bin/file/Magdir/pgp @@ -1,11 +1,12 @@ -# -# PGP (Pretty Good Privacy) + +#------------------------------------------------------------------------------ +# pgp: file(1) magic for Pretty Good Privacy # 0 beshort 0x9900 PGP key public ring 0 beshort 0x9501 PGP key security ring 0 beshort 0x9500 PGP key security ring 0 string -----BEGIN\040PGP PGP armored data ->15 string PUBLIC\040KEY\040BLOCK- (public key block) ->15 string MESSAGE- (message) ->15 string SIGNED\040MESSAGE- (signed message) ->15 string PGP\040SIGNATURE- (signature) +>15 string PUBLIC\040KEY\040BLOCK- public key block +>15 string MESSAGE- message +>15 string SIGNED\040MESSAGE- signed message +>15 string PGP\040SIGNATURE- signature diff --git a/usr.bin/file/Magdir/zyxel b/usr.bin/file/Magdir/zyxel index 410e93c..12a6abd 100644 --- a/usr.bin/file/Magdir/zyxel +++ b/usr.bin/file/Magdir/zyxel @@ -1,11 +1,16 @@ + +#------------------------------------------------------------------------------ +# zyxel: file(1) magic for ZyXEL modems +# # From <rob@pe1chl.ampr.org> # These are the /etc/magic entries to decode datafiles as used for the # ZyXEL U-1496E DATA/FAX/VOICE modems. (This header conforms to a # ZyXEL-defined standard) -0 string ZyXEL\002 ZyXEL voice data ->10 byte 0 - CELP encoding ->10 byte 1 - ADPCM2 encoding ->10 byte 2 - ADPCM3 encoding ->10 byte 3 - ADPCM4 encoding - +0 string ZyXEL\002 ZyXEL voice data +>10 byte 0 - CELP encoding +>10 byte&0x0B 1 - ADPCM2 encoding +>10 byte&0x0B 2 - ADPCM3 encoding +>10 byte&0x0B 3 - ADPCM4 encoding +>10 byte&0x0B 8 - New ADPCM3 encoding +>10 byte&0x04 4 with resync |
