Skip to content

Commit 60f7776

Browse files
bmomjianbmomjian
committed
Duh, my regexp's missed bunch of them. Here's next batch, this
should be all. Marko Kreen
1 parent d83cadb commit 60f7776

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed

‎contrib/pgcrypto/internal.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2727
* SUCH DAMAGE.
2828
*
29-
* $Id: internal.c,v 1.9 2001/11/20 15:50:53 momjian Exp $
29+
* $Id: internal.c,v 1.10 2001/11/20 18:54:07 momjian Exp $
3030
*/
3131

3232

@@ -77,13 +77,13 @@ static struct int_digest
7777

7878
/* MD5 */
7979

80-
static uint
80+
static unsigned
8181
int_md5_len(PX_MD * h)
8282
{
8383
return MD5_DIGEST_LENGTH;
8484
}
8585

86-
static uint
86+
static unsigned
8787
int_md5_block_len(PX_MD * h)
8888
{
8989
return MD5_BLOCK_SIZE;
@@ -124,13 +124,13 @@ int_md5_free(PX_MD * h)
124124

125125
/* SHA1 */
126126

127-
static uint
127+
static unsigned
128128
int_sha1_len(PX_MD * h)
129129
{
130130
return SHA1_DIGEST_LENGTH;
131131
}
132132

133-
static uint
133+
static unsigned
134134
int_sha1_block_len(PX_MD * h)
135135
{
136136
return SHA1_BLOCK_SIZE;
@@ -250,19 +250,19 @@ intctx_free(PX_Cipher * c)
250250
#define MODE_ECB 0
251251
#define MODE_CBC 1
252252

253-
static uint
253+
static unsigned
254254
rj_block_size(PX_Cipher * c)
255255
{
256256
return 128 / 8;
257257
}
258258

259-
static uint
259+
static unsigned
260260
rj_key_size(PX_Cipher * c)
261261
{
262262
return 256 / 8;
263263
}
264264

265-
static uint
265+
static unsigned
266266
rj_iv_size(PX_Cipher * c)
267267
{
268268
return 128 / 8;
@@ -388,19 +388,19 @@ rj_load(int mode)
388388
* blowfish
389389
*/
390390

391-
static uint
391+
static unsigned
392392
bf_block_size(PX_Cipher * c)
393393
{
394394
return 8;
395395
}
396396

397-
static uint
397+
static unsigned
398398
bf_key_size(PX_Cipher * c)
399399
{
400400
return BLF_MAXKEYLEN;
401401
}
402402

403-
static uint
403+
static unsigned
404404
bf_iv_size(PX_Cipher * c)
405405
{
406406
return 8;

‎contrib/pgcrypto/mhash.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2727
* SUCH DAMAGE.
2828
*
29-
* $Id: mhash.c,v 1.6 2001/11/20 15:50:53 momjian Exp $
29+
* $Id: mhash.c,v 1.7 2001/11/20 18:54:07 momjian Exp $
3030
*/
3131

3232
#include <postgres.h>
@@ -44,7 +44,7 @@
4444

4545
/* DIGEST */
4646

47-
static uint
47+
static unsigned
4848
digest_result_size(PX_MD * h)
4949
{
5050
MHASH mh = (MHASH) h->p.ptr;
@@ -53,7 +53,7 @@ digest_result_size(PX_MD * h)
5353
return mhash_get_block_size(id);
5454
}
5555

56-
static uint
56+
static unsigned
5757
digest_block_size(PX_MD * h)
5858
{
5959
MHASH mh = (MHASH) h->p.ptr;
@@ -110,23 +110,23 @@ digest_free(PX_MD * h)
110110

111111
/* ENCRYPT / DECRYPT */
112112

113-
static uint
113+
static unsigned
114114
cipher_block_size(PX_Cipher * c)
115115
{
116116
MCRYPT ctx = (MCRYPT) c->ptr;
117117

118118
return mcrypt_enc_get_block_size(ctx);
119119
}
120120

121-
static uint
121+
static unsigned
122122
cipher_key_size(PX_Cipher * c)
123123
{
124124
MCRYPT ctx = (MCRYPT) c->ptr;
125125

126126
return mcrypt_enc_get_key_size(ctx);
127127
}
128128

129-
static uint
129+
static unsigned
130130
cipher_iv_size(PX_Cipher * c)
131131
{
132132
MCRYPT ctx = (MCRYPT) c->ptr;

‎contrib/pgcrypto/openssl.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2727
* SUCH DAMAGE.
2828
*
29-
* $Id: openssl.c,v 1.9 2001/11/20 15:50:53 momjian Exp $
29+
* $Id: openssl.c,v 1.10 2001/11/20 18:54:07 momjian Exp $
3030
*/
3131

3232
#include <postgres.h>
@@ -36,13 +36,13 @@
3636
#include <openssl/evp.h>
3737
#include <openssl/blowfish.h>
3838

39-
static uint
39+
static unsigned
4040
digest_result_size(PX_MD * h)
4141
{
4242
return EVP_MD_CTX_size((EVP_MD_CTX *) h->p.ptr);
4343
}
4444

45-
static uint
45+
static unsigned
4646
digest_block_size(PX_MD * h)
4747
{
4848
return EVP_MD_CTX_block_size((EVP_MD_CTX *) h->p.ptr);
@@ -114,23 +114,23 @@ typedef struct
114114

115115
/* generic EVP */
116116

117-
static uint
117+
static unsigned
118118
gen_evp_block_size(PX_Cipher * c)
119119
{
120120
ossldata *od = (ossldata *) c->ptr;
121121

122122
return EVP_CIPHER_block_size(od->evp_ciph);
123123
}
124124

125-
static uint
125+
static unsigned
126126
gen_evp_key_size(PX_Cipher * c)
127127
{
128128
ossldata *od = (ossldata *) c->ptr;
129129

130130
return EVP_CIPHER_key_length(od->evp_ciph);
131131
}
132132

133-
static uint
133+
static unsigned
134134
gen_evp_iv_size(PX_Cipher * c)
135135
{
136136
unsigned ivlen;

‎contrib/pgcrypto/px-crypt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2727
* SUCH DAMAGE.
2828
*
29-
* $Id: px-crypt.c,v 1.5 2001/11/05 17:46:23 momjian Exp $
29+
* $Id: px-crypt.c,v 1.6 2001/11/20 18:54:07 momjian Exp $
3030
*/
3131

3232
#include <postgres.h>
@@ -158,7 +158,7 @@ static struct generator gen_list[] = {
158158
{NULL, NULL, 0, 0, 0}
159159
};
160160

161-
uint
161+
unsigned
162162
px_gen_salt(const char *salt_type, char *buf, int rounds)
163163
{
164164
int i,

‎contrib/pgcrypto/px-hmac.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2727
* SUCH DAMAGE.
2828
*
29-
* $Id: px-hmac.c,v 1.3 2001/11/20 15:50:53 momjian Exp $
29+
* $Id: px-hmac.c,v 1.4 2001/11/20 18:54:07 momjian Exp $
3030
*/
3131

3232

@@ -37,13 +37,13 @@
3737
#define HMAC_IPAD 0x36
3838
#define HMAC_OPAD 0x5C
3939

40-
static uint
40+
static unsigned
4141
hmac_result_size(PX_HMAC * h)
4242
{
4343
return px_md_result_size(h->md);
4444
}
4545

46-
static uint
46+
static unsigned
4747
hmac_block_size(PX_HMAC * h)
4848
{
4949
return px_md_block_size(h->md);

‎contrib/pgcrypto/px.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2727
* SUCH DAMAGE.
2828
*
29-
* $Id: px.c,v 1.5 2001/11/20 15:50:53 momjian Exp $
29+
* $Id: px.c,v 1.6 2001/11/20 18:54:07 momjian Exp $
3030
*/
3131

3232
#include <postgres.h>
@@ -50,13 +50,13 @@ px_resolve_alias(const PX_Alias * list, const char *name)
5050
* combo - cipher + padding (+ checksum)
5151
*/
5252

53-
static uint
53+
static unsigned
5454
combo_encrypt_len(PX_Combo * cx, unsigned dlen)
5555
{
5656
return dlen + 512;
5757
}
5858

59-
static uint
59+
static unsigned
6060
combo_decrypt_len(PX_Combo * cx, unsigned dlen)
6161
{
6262
return dlen;

0 commit comments

Comments
 (0)