diff options
author | Bruce Momjian | 2001-11-20 15:50:53 +0000 |
---|---|---|
committer | Bruce Momjian | 2001-11-20 15:50:53 +0000 |
commit | 540155b777b3f4143fb2a1db36f029856f15a070 (patch) | |
tree | 979601bdf84a55fea22f12e393054aa9a0f4eb86 /contrib/pgcrypto/px.c | |
parent | 01e0dae6896444b93f26cfe233155bbc7e33c0b8 (diff) |
pgcrypto uses non-standard type uint, which causes compile
failures on FreeBSD. This patch replaces uint -> unsigned.
This was reported by Daniel Holtzman against 0.4pre3 standalone
package, but it needs fixing in contrib/pgcrypto too.
Marko Kreen
Diffstat (limited to 'contrib/pgcrypto/px.c')
-rw-r--r-- | contrib/pgcrypto/px.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/contrib/pgcrypto/px.c b/contrib/pgcrypto/px.c index 15d8f5daf7b..44ceac927b1 100644 --- a/contrib/pgcrypto/px.c +++ b/contrib/pgcrypto/px.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: px.c,v 1.4 2001/11/08 15:56:58 momjian Exp $ + * $Id: px.c,v 1.5 2001/11/20 15:50:53 momjian Exp $ */ #include <postgres.h> @@ -51,23 +51,23 @@ px_resolve_alias(const PX_Alias * list, const char *name) */ static uint -combo_encrypt_len(PX_Combo * cx, uint dlen) +combo_encrypt_len(PX_Combo * cx, unsigned dlen) { return dlen + 512; } static uint -combo_decrypt_len(PX_Combo * cx, uint dlen) +combo_decrypt_len(PX_Combo * cx, unsigned dlen) { return dlen; } static int -combo_init(PX_Combo * cx, const uint8 *key, uint klen, - const uint8 *iv, uint ivlen) +combo_init(PX_Combo * cx, const uint8 *key, unsigned klen, + const uint8 *iv, unsigned ivlen) { int err; - uint bs, + unsigned bs, ks, ivs; PX_Cipher *c = cx->cipher; @@ -104,12 +104,12 @@ combo_init(PX_Combo * cx, const uint8 *key, uint klen, } static int -combo_encrypt(PX_Combo * cx, const uint8 *data, uint dlen, - uint8 *res, uint *rlen) +combo_encrypt(PX_Combo * cx, const uint8 *data, unsigned dlen, + uint8 *res, unsigned *rlen) { int err = 0; uint8 *bbuf; - uint bs, + unsigned bs, maxlen, bpos, i, @@ -175,13 +175,13 @@ out: } static int -combo_decrypt(PX_Combo * cx, const uint8 *data, uint dlen, - uint8 *res, uint *rlen) +combo_decrypt(PX_Combo * cx, const uint8 *data, unsigned dlen, + uint8 *res, unsigned *rlen) { - uint bs, + unsigned bs, i, pad; - uint pad_ok; + unsigned pad_ok; PX_Cipher *c = cx->cipher; |