diff options
| author | Andres Freund | 2017-10-01 22:36:14 +0000 |
|---|---|---|
| committer | Andres Freund | 2017-10-01 22:36:14 +0000 |
| commit | 0ba99c84e8c7138143059b281063d4cca5a2bfea (patch) | |
| tree | 521367c1888ca186fa229efc3489fb4298c8dc08 /src/common/scram-common.c | |
| parent | 1f2830f9df9f0196ba541c1e253463afe657cb67 (diff) | |
Replace most usages of ntoh[ls] and hton[sl] with pg_bswap.h.
All postgres internal usages are replaced, it's just libpq example
usages that haven't been converted. External users of libpq can't
generally rely on including postgres internal headers.
Note that this includes replacing open-coded byte swapping of 64bit
integers (using two 32 bit swaps) with a single 64bit swap.
Where it looked applicable, I have removed netinet/in.h and
arpa/inet.h usage, which previously provided the relevant
functionality. It's perfectly possible that I missed other reasons for
including those, the buildfarm will tell.
Author: Andres Freund
Discussion: https://postgr.es/m/20170927172019.gheidqy6xvlxb325@alap3.anarazel.de
Diffstat (limited to 'src/common/scram-common.c')
| -rw-r--r-- | src/common/scram-common.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/common/scram-common.c b/src/common/scram-common.c index e43d035d4da..e54fe1a7c98 100644 --- a/src/common/scram-common.c +++ b/src/common/scram-common.c @@ -19,12 +19,9 @@ #include "postgres_fe.h" #endif -/* for htonl */ -#include <netinet/in.h> -#include <arpa/inet.h> - #include "common/base64.h" #include "common/scram-common.h" +#include "port/pg_bswap.h" #define HMAC_IPAD 0x36 #define HMAC_OPAD 0x5C @@ -109,7 +106,7 @@ scram_SaltedPassword(const char *password, uint8 *result) { int password_len = strlen(password); - uint32 one = htonl(1); + uint32 one = pg_hton32(1); int i, j; uint8 Ui[SCRAM_KEY_LEN]; |