summaryrefslogtreecommitdiff
path: root/contrib/pgcrypto
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/pgcrypto')
-rw-r--r--contrib/pgcrypto/crypt-md5.c2
-rw-r--r--contrib/pgcrypto/internal.c6
-rw-r--r--contrib/pgcrypto/mbuf.c2
-rw-r--r--contrib/pgcrypto/openssl.c3
-rw-r--r--contrib/pgcrypto/pgcrypto.c7
-rw-r--r--contrib/pgcrypto/pgp-armor.c2
-rw-r--r--contrib/pgcrypto/pgp-cfb.c2
-rw-r--r--contrib/pgcrypto/pgp-compress.c3
-rw-r--r--contrib/pgcrypto/pgp-decrypt.c2
-rw-r--r--contrib/pgcrypto/pgp-encrypt.c3
-rw-r--r--contrib/pgcrypto/pgp-info.c2
-rw-r--r--contrib/pgcrypto/pgp-mpi-internal.c3
-rw-r--r--contrib/pgcrypto/pgp-mpi-openssl.c2
-rw-r--r--contrib/pgcrypto/pgp-mpi.c2
-rw-r--r--contrib/pgcrypto/pgp-pgsql.c11
-rw-r--r--contrib/pgcrypto/pgp-pubdec.c2
-rw-r--r--contrib/pgcrypto/pgp-pubenc.c2
-rw-r--r--contrib/pgcrypto/pgp-pubkey.c2
-rw-r--r--contrib/pgcrypto/pgp-s2k.c3
-rw-r--r--contrib/pgcrypto/pgp.c2
-rw-r--r--contrib/pgcrypto/px-crypt.c3
21 files changed, 29 insertions, 37 deletions
diff --git a/contrib/pgcrypto/crypt-md5.c b/contrib/pgcrypto/crypt-md5.c
index 6a09d76989..b6466d3e31 100644
--- a/contrib/pgcrypto/crypt-md5.c
+++ b/contrib/pgcrypto/crypt-md5.c
@@ -8,8 +8,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
+#include "px.h"
#define MD5_SIZE 16
diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
index db58408d4c..a12d7b4178 100644
--- a/contrib/pgcrypto/internal.c
+++ b/contrib/pgcrypto/internal.c
@@ -33,11 +33,11 @@
#include <time.h>
-#include "px.h"
-#include "md5.h"
-#include "sha1.h"
#include "blf.h"
+#include "md5.h"
+#include "px.h"
#include "rijndael.h"
+#include "sha1.h"
#ifndef MD5_DIGEST_LENGTH
#define MD5_DIGEST_LENGTH 16
diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c
index 73dbfbd08f..0467212a28 100644
--- a/contrib/pgcrypto/mbuf.c
+++ b/contrib/pgcrypto/mbuf.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
+#include "px.h"
#define STEP (16*1024)
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
index 7d686f3940..3057afb339 100644
--- a/contrib/pgcrypto/openssl.c
+++ b/contrib/pgcrypto/openssl.c
@@ -31,12 +31,11 @@
#include "postgres.h"
-#include "px.h"
-
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/rand.h>
+#include "px.h"
#include "utils/memutils.h"
#include "utils/resowner.h"
diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index f69ae107c3..f0ac625040 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -34,13 +34,12 @@
#include <ctype.h>
#include "parser/scansup.h"
+#include "pgcrypto.h"
+#include "px-crypt.h"
+#include "px.h"
#include "utils/builtins.h"
#include "utils/uuid.h"
-#include "px.h"
-#include "px-crypt.h"
-#include "pgcrypto.h"
-
PG_MODULE_MAGIC;
/* private stuff */
diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c
index aa5b563a31..679779a6ac 100644
--- a/contrib/pgcrypto/pgp-armor.c
+++ b/contrib/pgcrypto/pgp-armor.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* BASE64 - duplicated :(
diff --git a/contrib/pgcrypto/pgp-cfb.c b/contrib/pgcrypto/pgp-cfb.c
index 1d99915f9d..8ae7c8608f 100644
--- a/contrib/pgcrypto/pgp-cfb.c
+++ b/contrib/pgcrypto/pgp-cfb.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
typedef int (*mix_data_t) (PGP_CFB *ctx, const uint8 *data, int len, uint8 *dst);
diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c
index 2adaf2c875..0505bdee92 100644
--- a/contrib/pgcrypto/pgp-compress.c
+++ b/contrib/pgcrypto/pgp-compress.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
/*
* Compressed pkt writer
diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c
index 4c43eb7e3e..3ecbf9c0c2 100644
--- a/contrib/pgcrypto/pgp-decrypt.c
+++ b/contrib/pgcrypto/pgp-decrypt.c
@@ -31,9 +31,9 @@
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
#define NO_CTX_SIZE 0
#define ALLOW_CTX_SIZE 1
diff --git a/contrib/pgcrypto/pgp-encrypt.c b/contrib/pgcrypto/pgp-encrypt.c
index 2938b4b3f5..46518942ac 100644
--- a/contrib/pgcrypto/pgp-encrypt.c
+++ b/contrib/pgcrypto/pgp-encrypt.c
@@ -34,9 +34,8 @@
#include <time.h>
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
#define MDC_DIGEST_LEN 20
#define STREAM_ID 0xE0
diff --git a/contrib/pgcrypto/pgp-info.c b/contrib/pgcrypto/pgp-info.c
index 9bfbbe6d0c..b2300ea656 100644
--- a/contrib/pgcrypto/pgp-info.c
+++ b/contrib/pgcrypto/pgp-info.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
static int
read_pubkey_keyid(PullFilter *pkt, uint8 *keyid_buf)
diff --git a/contrib/pgcrypto/pgp-mpi-internal.c b/contrib/pgcrypto/pgp-mpi-internal.c
index c73f086b0b..2353a48a07 100644
--- a/contrib/pgcrypto/pgp-mpi-internal.c
+++ b/contrib/pgcrypto/pgp-mpi-internal.c
@@ -31,9 +31,8 @@
#include "postgres.h"
#include "imath.h"
-
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static mpz_t *
mp_new()
diff --git a/contrib/pgcrypto/pgp-mpi-openssl.c b/contrib/pgcrypto/pgp-mpi-openssl.c
index afece26918..75e4c8b300 100644
--- a/contrib/pgcrypto/pgp-mpi-openssl.c
+++ b/contrib/pgcrypto/pgp-mpi-openssl.c
@@ -32,8 +32,8 @@
#include <openssl/bn.h>
-#include "px.h"
#include "pgp.h"
+#include "px.h"
static BIGNUM *
mpi_to_bn(PGP_MPI *n)
diff --git a/contrib/pgcrypto/pgp-mpi.c b/contrib/pgcrypto/pgp-mpi.c
index 1da52acc9a..36a6d361ab 100644
--- a/contrib/pgcrypto/pgp-mpi.c
+++ b/contrib/pgcrypto/pgp-mpi.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
int
pgp_mpi_alloc(int bits, PGP_MPI **mpi)
diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c
index 3feadf7b70..8be895df80 100644
--- a/contrib/pgcrypto/pgp-pgsql.c
+++ b/contrib/pgcrypto/pgp-pgsql.c
@@ -31,16 +31,15 @@
#include "postgres.h"
-#include "lib/stringinfo.h"
#include "catalog/pg_type.h"
-#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
-#include "utils/array.h"
#include "funcapi.h"
-
+#include "lib/stringinfo.h"
+#include "mb/pg_wchar.h"
#include "mbuf.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
+#include "utils/array.h"
+#include "utils/builtins.h"
/*
* public functions
diff --git a/contrib/pgcrypto/pgp-pubdec.c b/contrib/pgcrypto/pgp-pubdec.c
index b925ff8599..a0a5738a40 100644
--- a/contrib/pgcrypto/pgp-pubdec.c
+++ b/contrib/pgcrypto/pgp-pubdec.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg = 02 || PS || 00 || M
diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c
index 08599f0978..9fdcf7c31c 100644
--- a/contrib/pgcrypto/pgp-pubenc.c
+++ b/contrib/pgcrypto/pgp-pubenc.c
@@ -30,8 +30,8 @@
*/
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* padded msg: 02 || non-zero pad bytes || 00 || msg
diff --git a/contrib/pgcrypto/pgp-pubkey.c b/contrib/pgcrypto/pgp-pubkey.c
index f898d72ae9..d447e5fd4f 100644
--- a/contrib/pgcrypto/pgp-pubkey.c
+++ b/contrib/pgcrypto/pgp-pubkey.c
@@ -30,9 +30,9 @@
*/
#include "postgres.h"
-#include "px.h"
#include "mbuf.h"
#include "pgp.h"
+#include "px.h"
int
pgp_key_alloc(PGP_PubKey **pk_p)
diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c
index 3f2f442ffc..81ca1f094a 100644
--- a/contrib/pgcrypto/pgp-s2k.c
+++ b/contrib/pgcrypto/pgp-s2k.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
-
+#include "px.h"
static int
calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key,
diff --git a/contrib/pgcrypto/pgp.c b/contrib/pgcrypto/pgp.c
index dd8dae1b84..9b245fee61 100644
--- a/contrib/pgcrypto/pgp.c
+++ b/contrib/pgcrypto/pgp.c
@@ -31,8 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "pgp.h"
+#include "px.h"
/*
* Defaults.
diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c
index 51be0b7da1..0913ff2c1b 100644
--- a/contrib/pgcrypto/px-crypt.c
+++ b/contrib/pgcrypto/px-crypt.c
@@ -31,9 +31,8 @@
#include "postgres.h"
-#include "px.h"
#include "px-crypt.h"
-
+#include "px.h"
static char *
run_crypt_des(const char *psw, const char *salt,
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-16 01:24:02 +0000