head	1.5;
access;
symbols
	RELENG_4_11_0_RELEASE:1.4.6.1
	RELENG_4_11:1.4.6.1.0.18
	RELENG_4_11_BP:1.4.6.1
	RELENG_4_10_0_RELEASE:1.4.6.1
	RELENG_4_10:1.4.6.1.0.16
	RELENG_4_10_BP:1.4.6.1
	RELENG_4_9_0_RELEASE:1.4.6.1
	RELENG_4_9:1.4.6.1.0.14
	RELENG_4_9_BP:1.4.6.1
	RELENG_4_8_0_RELEASE:1.4.6.1
	RELENG_4_8:1.4.6.1.0.12
	RELENG_4_8_BP:1.4.6.1
	RELENG_4_7_0_RELEASE:1.4.6.1
	RELENG_4_7:1.4.6.1.0.10
	RELENG_4_7_BP:1.4.6.1
	RELENG_4_6_2_RELEASE:1.4.6.1
	RELENG_4_6_1_RELEASE:1.4.6.1
	RELENG_4_6_0_RELEASE:1.4.6.1
	RELENG_4_6:1.4.6.1.0.8
	RELENG_4_6_BP:1.4.6.1
	RELENG_4_5_0_RELEASE:1.4.6.1
	RELENG_4_5:1.4.6.1.0.6
	RELENG_4_5_BP:1.4.6.1
	RELENG_4_4_0_RELEASE:1.4.6.1
	RELENG_4_4:1.4.6.1.0.4
	RELENG_4_4_BP:1.4.6.1
	RELENG_4_3_0_RELEASE:1.4.6.1
	RELENG_4_3:1.4.6.1.0.2
	RELENG_4_3_BP:1.4.6.1
	RELENG_4_2_0_RELEASE:1.4
	RELENG_4_1_1_RELEASE:1.4
	PRE_SMPNG:1.4
	RELENG_4_1_0_RELEASE:1.4
	RELENG_3_5_0_RELEASE:1.4
	RELENG_4_0_0_RELEASE:1.4
	RELENG_4:1.4.0.6
	RELENG_4_BP:1.4
	RELENG_3_4_0_RELEASE:1.4
	RELENG_3_3_0_RELEASE:1.4
	RELENG_3_2_PAO:1.4.0.4
	RELENG_3_2_PAO_BP:1.4
	RELENG_3_2_0_RELEASE:1.4
	RELENG_3_1_0_RELEASE:1.4
	RELENG_3:1.4.0.2
	RELENG_3_BP:1.4
	RELENG_2_2_8_RELEASE:1.3.2.1
	RELENG_3_0_0_RELEASE:1.4
	RELENG_2_2_7_RELEASE:1.3.2.1
	RELENG_2_2_6_RELEASE:1.3.2.1
	RELENG_2_2_5_RELEASE:1.3.2.1
	RELENG_2_2_2_RELEASE:1.3
	RELENG_2_2_1_RELEASE:1.3
	file_3_22:1.1.1.3
	RELENG_2_2_0_RELEASE:1.3
	RELENG_2_1_7_RELEASE:1.1.1.1.6.1
	RELENG_2_1_6_1_RELEASE:1.1.1.1.6.1
	RELENG_2_1_6_RELEASE:1.1.1.1.6.1
	RELENG_2_2:1.3.0.2
	RELENG_2_2_BP:1.3
	RELENG_2_1_5_RELEASE:1.1.1.1.6.1
	file_3_19:1.1.1.2
	RELENG_2_1_0_RELEASE:1.1.1.1.6.1
	RELENG_2_1_0:1.1.1.1.0.6
	RELENG_2_1_0_BP:1.1.1.1
	RELENG_2_0_5_RELEASE:1.1.1.1
	RELENG_2_0_5:1.1.1.1.0.4
	RELENG_2_0_5_BP:1.1.1.1
	RELENG_2_0_5_ALPHA:1.1.1.1
	RELEASE_2_0:1.1.1.1
	BETA_2_0:1.1.1.1
	ALPHA_2_0:1.1.1.1.0.2
	file_3_14:1.1.1.1
	DARWIN:1.1.1;
locks; strict;
comment	@# @;


1.5
date	2000.11.05.09.06.05;	author obrien;	state dead;
branches;
next	1.4;

1.4
date	97.03.18.19.37.41;	author mpp;	state Exp;
branches
	1.4.6.1;
next	1.3;

1.3
date	96.01.23.12.40.35;	author mpp;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	95.08.03.07.11.45;	author phk;	state Exp;
branches;
next	1.1;

1.1
date	94.09.03.19.16.26;	author csgr;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	94.09.03.19.16.27;	author csgr;	state Exp;
branches
	1.1.1.1.6.1;
next	1.1.1.2;

1.1.1.2
date	96.01.23.12.28.23;	author mpp;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	97.03.18.17.59.43;	author mpp;	state Exp;
branches;
next	;

1.1.1.1.6.1
date	95.10.06.01.33.06;	author davidg;	state Exp;
branches;
next	;

1.3.2.1
date	97.08.18.18.59.52;	author jdp;	state Exp;
branches;
next	;

1.4.6.1
date	2000.11.29.19.32.50;	author obrien;	state dead;
branches;
next	;


desc
@@


1.5
log
@Switch over to using the Christos Zoulas maintained version in contrib/
This also gives use the same exact results as NetBSD, thus sharing more
code with our bretheren.
@
text
@
#------------------------------------------------------------------------------
# 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	beshort		0xa600			PGP encrypted data
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
@


1.4
log
@Merge to resolve conflicts with file 3.22 merge.
@
text
@@


1.4.6.1
log
@MFC: switch over to using the Christos Zoulas maintained version in contrib/
@
text
@@


1.3
log
@Merged changes to resolve conflicts with file 3.19 import.
@
text
@d8 1
@


1.3.2.1
log
@Sync with -current.
@
text
@a7 1
0	beshort		0xa600			PGP encrypted data
@


1.2
log
@Sanitize the PGP strings a bit.
@
text
@d1 3
a3 2
#
# PGP (Pretty Good Privacy)
d9 4
a12 4
>15     string          PUBLIC\040KEY\040BLOCK- (public key block)
>15     string          MESSAGE-                (message)
>15     string          SIGNED\040MESSAGE-      (signed message)
>15     string          PGP\040SIGNATURE-       (signature)
@


1.1
log
@Initial revision
@
text
@d2 10
a11 9
# pgp (pretty good protection)
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
@


1.1.1.1
log
@Bring in file 3.14 by Ian Darwin (and Christos Zoulas)

The following files were moved to different names:
- file.man -> file.1
- magic.man -> magic.5

The following file was removed:
- Magdir/Makefile
@
text
@@


1.1.1.2
log
@Upgrade to file version 3.19.
@
text
@a0 3

#------------------------------------------------------------------------------
# pgp:  file(1) magic for Pretty Good Privacy
d2 6
a7 5
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
@


1.1.1.3
log
@Upgrade to file version 3.22.

Obtained from: ftp://ftp.deshaw.com/pub/file/file-3.22.tar.gz
@
text
@a7 1
0	beshort		0xa600			PGP encrypted data
@


1.1.1.1.6.1
log
@Sync with main branch.
@
text
@d2 9
a10 10
# PGP (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)
@
