diff options
Diffstat (limited to 'src/include/common/scram-common.h')
| -rw-r--r-- | src/include/common/scram-common.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/include/common/scram-common.h b/src/include/common/scram-common.h index 2edae2dd3c..f4a7c60725 100644 --- a/src/include/common/scram-common.h +++ b/src/include/common/scram-common.h @@ -13,6 +13,7 @@ #ifndef SCRAM_COMMON_H #define SCRAM_COMMON_H +#include "common/cryptohash.h" #include "common/sha2.h" /* Name of SCRAM mechanisms per IANA */ @@ -50,19 +51,19 @@ */ typedef struct { - pg_sha256_ctx sha256ctx; + pg_cryptohash_ctx *sha256ctx; uint8 k_opad[SHA256_HMAC_B]; } scram_HMAC_ctx; -extern void scram_HMAC_init(scram_HMAC_ctx *ctx, const uint8 *key, int keylen); -extern void scram_HMAC_update(scram_HMAC_ctx *ctx, const char *str, int slen); -extern void scram_HMAC_final(uint8 *result, scram_HMAC_ctx *ctx); +extern int scram_HMAC_init(scram_HMAC_ctx *ctx, const uint8 *key, int keylen); +extern int scram_HMAC_update(scram_HMAC_ctx *ctx, const char *str, int slen); +extern int scram_HMAC_final(uint8 *result, scram_HMAC_ctx *ctx); -extern void scram_SaltedPassword(const char *password, const char *salt, +extern int scram_SaltedPassword(const char *password, const char *salt, int saltlen, int iterations, uint8 *result); -extern void scram_H(const uint8 *str, int len, uint8 *result); -extern void scram_ClientKey(const uint8 *salted_password, uint8 *result); -extern void scram_ServerKey(const uint8 *salted_password, uint8 *result); +extern int scram_H(const uint8 *str, int len, uint8 *result); +extern int scram_ClientKey(const uint8 *salted_password, uint8 *result); +extern int scram_ServerKey(const uint8 *salted_password, uint8 *result); extern char *scram_build_secret(const char *salt, int saltlen, int iterations, const char *password); |