NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit38698dd

committed

Unwind #if spaghetti in hmac_openssl.c a bit.

Make this code a little less confusing by defining a separate macrothat controls whether we'll use ResourceOwner facilities to trackthe existence of a pg_hmac_ctx context.The proximate reason to touch this is that sinceb8bff07, we got"unused function" warnings if building with older OpenSSL, becausethe #if guards around the ResourceOwner wrapper function definitionswere different from those around the calls of those functions.Pulling the ResourceOwner machinations outside of the #ifdef HAVE_xxxguards fixes that and makes the code clearer too.Discussion:https://postgr.es/m/1394271.1712016101@sss.pgh.pa.us

1 parentcafe105 commit38698ddCopy full SHA for 38698dd

File tree

1 file changed

+18

-14

lines changed

src/common
- hmac_openssl.c

1 file changed

+18

-14

lines changed

`‎src/common/hmac_openssl.c`

Lines changed: 18 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`*/`
`42`	`42`	`#ifndefFRONTEND`
`43`	`43`	`#ifdefHAVE_HMAC_CTX_NEW`
	`44`	`+#defineUSE_RESOWNER_FOR_HMAC`
`44`	`45`	`#defineALLOC(size) MemoryContextAlloc(TopMemoryContext, size)`
`45`	`46`	`#else`
`46`	`47`	`#defineALLOC(size) palloc(size)`
`@@ -67,13 +68,13 @@ struct pg_hmac_ctx`
`67`	`68`	`pg_hmac_errnoerror;`
`68`	`69`	`constchar*errreason;`
`69`	`70`
`70`		`-#ifndefFRONTEND`
	`71`	`+#ifdefUSE_RESOWNER_FOR_HMAC`
`71`	`72`	`ResourceOwnerresowner;`
`72`	`73`	`#endif`
`73`	`74`	`};`
`74`	`75`
`75`	`76`	`/* ResourceOwner callbacks to hold HMAC contexts */`
`76`		`-#ifndefFRONTEND`
	`77`	`+#ifdefUSE_RESOWNER_FOR_HMAC`
`77`	`78`	`staticvoidResOwnerReleaseHMAC(Datumres);`
`78`	`79`
`79`	`80`	`staticconstResourceOwnerDeschmac_resowner_desc=`
`@@ -138,10 +139,12 @@ pg_hmac_create(pg_cryptohash_type type)`
`138`	`139`	`* previous runs.`
`139`	`140`	`*/`
`140`	`141`	`ERR_clear_error();`
`141`		`-#ifdefHAVE_HMAC_CTX_NEW`
`142`		`-#ifndefFRONTEND`
	`142`	`+`
	`143`	`+#ifdefUSE_RESOWNER_FOR_HMAC`
`143`	`144`	`ResourceOwnerEnlarge(CurrentResourceOwner);`
`144`	`145`	`#endif`
	`146`	`+`
	`147`	`+#ifdefHAVE_HMAC_CTX_NEW`
`145`	`148`	`ctx->hmacctx=HMAC_CTX_new();`
`146`	`149`	`#else`
`147`	`150`	`ctx->hmacctx=ALLOC(sizeof(HMAC_CTX));`
`@@ -159,14 +162,14 @@ pg_hmac_create(pg_cryptohash_type type)`
`159`	`162`	`returnNULL;`
`160`	`163`	`}`
`161`	`164`
`162`		`-#ifdefHAVE_HMAC_CTX_NEW`
`163`		`-#ifndefFRONTEND`
	`165`	`+#ifndefHAVE_HMAC_CTX_NEW`
	`166`	`+memset(ctx->hmacctx,0,sizeof(HMAC_CTX));`
	`167`	`+#endif`
	`168`	`+`
	`169`	`+#ifdefUSE_RESOWNER_FOR_HMAC`
`164`	`170`	`ctx->resowner=CurrentResourceOwner;`
`165`	`171`	`ResourceOwnerRememberHMAC(CurrentResourceOwner,ctx);`
`166`	`172`	`#endif`
`167`		`-#else`
`168`		`-memset(ctx->hmacctx,0,sizeof(HMAC_CTX));`
`169`		`-#endif/* HAVE_HMAC_CTX_NEW */`
`170`	`173`
`171`	`174`	`returnctx;`
`172`	`175`	`}`
`@@ -327,15 +330,16 @@ pg_hmac_free(pg_hmac_ctx *ctx)`
`327`	`330`
`328`	`331`	`#ifdefHAVE_HMAC_CTX_FREE`
`329`	`332`	`HMAC_CTX_free(ctx->hmacctx);`
`330`		`-#ifndefFRONTEND`
`331`		`-if (ctx->resowner)`
`332`		`-ResourceOwnerForgetHMAC(ctx->resowner,ctx);`
`333`		`-#endif`
`334`	`333`	`#else`
`335`	`334`	`explicit_bzero(ctx->hmacctx,sizeof(HMAC_CTX));`
`336`	`335`	`FREE(ctx->hmacctx);`
`337`	`336`	`#endif`
`338`	`337`
	`338`	`+#ifdefUSE_RESOWNER_FOR_HMAC`
	`339`	`+if (ctx->resowner)`
	`340`	`+ResourceOwnerForgetHMAC(ctx->resowner,ctx);`
	`341`	`+#endif`
	`342`	`+`
`339`	`343`	`explicit_bzero(ctx,sizeof(pg_hmac_ctx));`
`340`	`344`	`FREE(ctx);`
`341`	`345`	`}`
`@@ -375,7 +379,7 @@ pg_hmac_error(pg_hmac_ctx *ctx)`
`375`	`379`
`376`	`380`	`/* ResourceOwner callbacks */`
`377`	`381`
`378`		`-#ifndefFRONTEND`
	`382`	`+#ifdefUSE_RESOWNER_FOR_HMAC`
`379`	`383`	`staticvoid`
`380`	`384`	`ResOwnerReleaseHMAC(Datumres)`
`381`	`385`	`{`

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!

Commit38698dd

File tree

1 file changed

1 file changed

`‎src/common/hmac_openssl.c`

0 commit comments