Skip to content

Guard src/ipcrypt.c against libsodium < 1.0.21 #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devrimgunduz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Guard src/ipcrypt.c against libsodium < 1.0.21 #125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 113 additions & 0 deletions src/ipcrypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ set search_path to pgsodium,public; -- pragma:hide

#include "pgsodium.h"

#if __has_include(<sodium/crypto_ipcrypt.h>)
#include <sodium/crypto_ipcrypt.h>

/* ---------------------------------------------------------------------------
* Conversion helpers between text IP addresses and the 16 byte binary form.
* ------------------------------------------------------------------------- */
Expand Down Expand Up @@ -536,3 +539,113 @@ pgsodium_crypto_ipcrypt_ndx_decrypt_by_id (PG_FUNCTION_ARGS)
PGSODIUM_UCHARDATA_ANY (ct), PGSODIUM_UCHARDATA_ANY (key));
PG_RETURN_BYTEA_P (result);
}

#else /* !__has_include(<sodium/crypto_ipcrypt.h>) */

/*
* Stub implementations for systems where libsodium < 1.0.21.
* The extension builds and installs normally; calling any ipcrypt
* function raises a clear error at runtime.
*/
#define IPCRYPT_UNAVAILABLE() \
ereport(ERROR, \
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), \
errmsg("%s: ipcrypt requires libsodium >= 1.0.21", __func__)))

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_ip2bin);
Datum pgsodium_crypto_ipcrypt_ip2bin(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_bin2ip);
Datum pgsodium_crypto_ipcrypt_bin2ip(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_keygen);
Datum pgsodium_crypto_ipcrypt_keygen(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_encrypt);
Datum pgsodium_crypto_ipcrypt_encrypt(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_decrypt);
Datum pgsodium_crypto_ipcrypt_decrypt(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_encrypt_by_id);
Datum pgsodium_crypto_ipcrypt_encrypt_by_id(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_decrypt_by_id);
Datum pgsodium_crypto_ipcrypt_decrypt_by_id(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_pfx_keygen);
Datum pgsodium_crypto_ipcrypt_pfx_keygen(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_pfx_encrypt);
Datum pgsodium_crypto_ipcrypt_pfx_encrypt(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_pfx_decrypt);
Datum pgsodium_crypto_ipcrypt_pfx_decrypt(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_pfx_encrypt_by_id);
Datum pgsodium_crypto_ipcrypt_pfx_encrypt_by_id(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_pfx_decrypt_by_id);
Datum pgsodium_crypto_ipcrypt_pfx_decrypt_by_id(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_nd_keygen);
Datum pgsodium_crypto_ipcrypt_nd_keygen(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_nd_tweakgen);
Datum pgsodium_crypto_ipcrypt_nd_tweakgen(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_nd_encrypt);
Datum pgsodium_crypto_ipcrypt_nd_encrypt(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_nd_decrypt);
Datum pgsodium_crypto_ipcrypt_nd_decrypt(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_nd_encrypt_by_id);
Datum pgsodium_crypto_ipcrypt_nd_encrypt_by_id(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_nd_decrypt_by_id);
Datum pgsodium_crypto_ipcrypt_nd_decrypt_by_id(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_ndx_keygen);
Datum pgsodium_crypto_ipcrypt_ndx_keygen(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_ndx_tweakgen);
Datum pgsodium_crypto_ipcrypt_ndx_tweakgen(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_ndx_encrypt);
Datum pgsodium_crypto_ipcrypt_ndx_encrypt(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_ndx_decrypt);
Datum pgsodium_crypto_ipcrypt_ndx_decrypt(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_ndx_encrypt_by_id);
Datum pgsodium_crypto_ipcrypt_ndx_encrypt_by_id(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

PG_FUNCTION_INFO_V1(pgsodium_crypto_ipcrypt_ndx_decrypt_by_id);
Datum pgsodium_crypto_ipcrypt_ndx_decrypt_by_id(PG_FUNCTION_ARGS)
{ IPCRYPT_UNAVAILABLE(); PG_RETURN_NULL(); }

#endif /* __has_include(<sodium/crypto_ipcrypt.h>) */