NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit050a78d

committed

Fix old thinko in pgp.h: the idea is to declare some named enum types,

not global variables of anonymous enum types. This didn't actually hurtmuch because most linkers will just merge the duplicated definitions ...but some will complain. Per bug #4731 from Ceriel Jacobs.Backpatch to 8.1 --- the declarations don't exist before that.

1 parent9f843d1 commit050a78dCopy full SHA for 050a78d

File tree

1 file changed

+13

-13

lines changed

contrib/pgcrypto
- pgp.h

1 file changed

+13

-13

lines changed

`‎contrib/pgcrypto/pgp.h`

Lines changed: 13 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,17 +26,17 @@`
`26`	`26`	`* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF`
`27`	`27`	`* SUCH DAMAGE.`
`28`	`28`	`*`
`29`		`- * $PostgreSQL: pgsql/contrib/pgcrypto/pgp.h,v 1.4 2005/10/15 02:49:06 momjian Exp $`
	`29`	`+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgp.h,v 1.5 2009/03/25 15:03:13 tgl Exp $`
`30`	`30`	`*/`
`31`	`31`
`32`		`-enum`
	`32`	`+enumPGP_S2K_TYPE`
`33`	`33`	`{`
`34`	`34`	`PGP_S2K_SIMPLE=0,`
`35`	`35`	`PGP_S2K_SALTED=1,`
`36`	`36`	`PGP_S2K_ISALTED=3`
`37`		`-}PGP_S2K_TYPE;`
	`37`	`+};`
`38`	`38`
`39`		`-enum`
	`39`	`+enumPGP_PKT_TYPE`
`40`	`40`	`{`
`41`	`41`	`PGP_PKT_RESERVED=0,`
`42`	`42`	`PGP_PKT_PUBENCRYPTED_SESSKEY=1,`
`@@ -56,18 +56,18 @@ enum`
`56`	`56`	`PGP_PKT_SYMENCRYPTED_DATA_MDC=18,`
`57`	`57`	`PGP_PKT_MDC=19,`
`58`	`58`	`PGP_PKT_PRIV_61=61/* occurs in gpg secring */`
`59`		`-}PGP_PKT_TYPE;`
	`59`	`+};`
`60`	`60`
`61`		`-enum`
	`61`	`+enumPGP_PUB_ALGO_TYPE`
`62`	`62`	`{`
`63`	`63`	`PGP_PUB_RSA_ENCRYPT_SIGN=1,`
`64`	`64`	`PGP_PUB_RSA_ENCRYPT=2,`
`65`	`65`	`PGP_PUB_RSA_SIGN=3,`
`66`	`66`	`PGP_PUB_ELG_ENCRYPT=16,`
`67`	`67`	`PGP_PUB_DSA_SIGN=17`
`68`		`-}PGP_PUB_ALGO_TYPE;`
	`68`	`+};`
`69`	`69`
`70`		`-enum`
	`70`	`+enumPGP_SYMENC_TYPE`
`71`	`71`	`{`
`72`	`72`	`PGP_SYM_PLAIN=0,/* ?? */`
`73`	`73`	`PGP_SYM_IDEA=1,/* obsolete, PGP 2.6 compat */`
`@@ -80,17 +80,17 @@ enum`
`80`	`80`	`PGP_SYM_AES_192=8,`
`81`	`81`	`PGP_SYM_AES_256=9,`
`82`	`82`	`PGP_SYM_TWOFISH=10`
`83`		`-}PGP_SYMENC_TYPE;`
	`83`	`+};`
`84`	`84`
`85`		`-enum`
	`85`	`+enumPGP_COMPR_TYPE`
`86`	`86`	`{`
`87`	`87`	`PGP_COMPR_NONE=0,/* must */`
`88`	`88`	`PGP_COMPR_ZIP=1,/* should */`
`89`	`89`	`PGP_COMPR_ZLIB=2,`
`90`	`90`	`PGP_COMPR_BZIP2=3`
`91`		`-}PGP_COMPR_TYPE;`
	`91`	`+};`
`92`	`92`
`93`		`-enum`
	`93`	`+enumPGP_DIGEST_TYPE`
`94`	`94`	`{`
`95`	`95`	`PGP_DIGEST_MD5=1,/* should, deprecated */`
`96`	`96`	`PGP_DIGEST_SHA1=2,/* must */`
`@@ -102,7 +102,7 @@ enum`
`102`	`102`	`PGP_DIGEST_SHA256=8,`
`103`	`103`	`PGP_DIGEST_SHA384=9,`
`104`	`104`	`PGP_DIGEST_SHA512=10`
`105`		`-}PGP_DIGEST_TYPE;`
	`105`	`+};`
`106`	`106`
`107`	`107`	`#definePGP_MAX_KEY (256/8)`
`108`	`108`	`#definePGP_MAX_BLOCK (256/8)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit050a78d

File tree

1 file changed

1 file changed

`‎contrib/pgcrypto/pgp.h`

0 commit comments