mirror of
https://git.postgresql.org/git/postgresql.git
synced 2025-01-12 18:34:36 +08:00
Duh, my regexp's missed bunch of them. Here's next batch, this
should be all. Marko Kreen
This commit is contained in:
parent
d83cadb314
commit
60f777606f
@ -26,7 +26,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: internal.c,v 1.9 2001/11/20 15:50:53 momjian Exp $
|
||||
* $Id: internal.c,v 1.10 2001/11/20 18:54:07 momjian Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -77,13 +77,13 @@ static struct int_digest
|
||||
|
||||
/* MD5 */
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
int_md5_len(PX_MD * h)
|
||||
{
|
||||
return MD5_DIGEST_LENGTH;
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
int_md5_block_len(PX_MD * h)
|
||||
{
|
||||
return MD5_BLOCK_SIZE;
|
||||
@ -124,13 +124,13 @@ int_md5_free(PX_MD * h)
|
||||
|
||||
/* SHA1 */
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
int_sha1_len(PX_MD * h)
|
||||
{
|
||||
return SHA1_DIGEST_LENGTH;
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
int_sha1_block_len(PX_MD * h)
|
||||
{
|
||||
return SHA1_BLOCK_SIZE;
|
||||
@ -250,19 +250,19 @@ intctx_free(PX_Cipher * c)
|
||||
#define MODE_ECB 0
|
||||
#define MODE_CBC 1
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
rj_block_size(PX_Cipher * c)
|
||||
{
|
||||
return 128 / 8;
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
rj_key_size(PX_Cipher * c)
|
||||
{
|
||||
return 256 / 8;
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
rj_iv_size(PX_Cipher * c)
|
||||
{
|
||||
return 128 / 8;
|
||||
@ -388,19 +388,19 @@ rj_load(int mode)
|
||||
* blowfish
|
||||
*/
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
bf_block_size(PX_Cipher * c)
|
||||
{
|
||||
return 8;
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
bf_key_size(PX_Cipher * c)
|
||||
{
|
||||
return BLF_MAXKEYLEN;
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
bf_iv_size(PX_Cipher * c)
|
||||
{
|
||||
return 8;
|
||||
|
@ -26,7 +26,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: mhash.c,v 1.6 2001/11/20 15:50:53 momjian Exp $
|
||||
* $Id: mhash.c,v 1.7 2001/11/20 18:54:07 momjian Exp $
|
||||
*/
|
||||
|
||||
#include <postgres.h>
|
||||
@ -44,7 +44,7 @@
|
||||
|
||||
/* DIGEST */
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
digest_result_size(PX_MD * h)
|
||||
{
|
||||
MHASH mh = (MHASH) h->p.ptr;
|
||||
@ -53,7 +53,7 @@ digest_result_size(PX_MD * h)
|
||||
return mhash_get_block_size(id);
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
digest_block_size(PX_MD * h)
|
||||
{
|
||||
MHASH mh = (MHASH) h->p.ptr;
|
||||
@ -110,7 +110,7 @@ digest_free(PX_MD * h)
|
||||
|
||||
/* ENCRYPT / DECRYPT */
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
cipher_block_size(PX_Cipher * c)
|
||||
{
|
||||
MCRYPT ctx = (MCRYPT) c->ptr;
|
||||
@ -118,7 +118,7 @@ cipher_block_size(PX_Cipher * c)
|
||||
return mcrypt_enc_get_block_size(ctx);
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
cipher_key_size(PX_Cipher * c)
|
||||
{
|
||||
MCRYPT ctx = (MCRYPT) c->ptr;
|
||||
@ -126,7 +126,7 @@ cipher_key_size(PX_Cipher * c)
|
||||
return mcrypt_enc_get_key_size(ctx);
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
cipher_iv_size(PX_Cipher * c)
|
||||
{
|
||||
MCRYPT ctx = (MCRYPT) c->ptr;
|
||||
|
@ -26,7 +26,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: openssl.c,v 1.9 2001/11/20 15:50:53 momjian Exp $
|
||||
* $Id: openssl.c,v 1.10 2001/11/20 18:54:07 momjian Exp $
|
||||
*/
|
||||
|
||||
#include <postgres.h>
|
||||
@ -36,13 +36,13 @@
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/blowfish.h>
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
digest_result_size(PX_MD * h)
|
||||
{
|
||||
return EVP_MD_CTX_size((EVP_MD_CTX *) h->p.ptr);
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
digest_block_size(PX_MD * h)
|
||||
{
|
||||
return EVP_MD_CTX_block_size((EVP_MD_CTX *) h->p.ptr);
|
||||
@ -114,7 +114,7 @@ typedef struct
|
||||
|
||||
/* generic EVP */
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
gen_evp_block_size(PX_Cipher * c)
|
||||
{
|
||||
ossldata *od = (ossldata *) c->ptr;
|
||||
@ -122,7 +122,7 @@ gen_evp_block_size(PX_Cipher * c)
|
||||
return EVP_CIPHER_block_size(od->evp_ciph);
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
gen_evp_key_size(PX_Cipher * c)
|
||||
{
|
||||
ossldata *od = (ossldata *) c->ptr;
|
||||
@ -130,7 +130,7 @@ gen_evp_key_size(PX_Cipher * c)
|
||||
return EVP_CIPHER_key_length(od->evp_ciph);
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
gen_evp_iv_size(PX_Cipher * c)
|
||||
{
|
||||
unsigned ivlen;
|
||||
|
@ -26,7 +26,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: px-crypt.c,v 1.5 2001/11/05 17:46:23 momjian Exp $
|
||||
* $Id: px-crypt.c,v 1.6 2001/11/20 18:54:07 momjian Exp $
|
||||
*/
|
||||
|
||||
#include <postgres.h>
|
||||
@ -158,7 +158,7 @@ static struct generator gen_list[] = {
|
||||
{NULL, NULL, 0, 0, 0}
|
||||
};
|
||||
|
||||
uint
|
||||
unsigned
|
||||
px_gen_salt(const char *salt_type, char *buf, int rounds)
|
||||
{
|
||||
int i,
|
||||
|
@ -26,7 +26,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: px-hmac.c,v 1.3 2001/11/20 15:50:53 momjian Exp $
|
||||
* $Id: px-hmac.c,v 1.4 2001/11/20 18:54:07 momjian Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -37,13 +37,13 @@
|
||||
#define HMAC_IPAD 0x36
|
||||
#define HMAC_OPAD 0x5C
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
hmac_result_size(PX_HMAC * h)
|
||||
{
|
||||
return px_md_result_size(h->md);
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
hmac_block_size(PX_HMAC * h)
|
||||
{
|
||||
return px_md_block_size(h->md);
|
||||
|
@ -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.5 2001/11/20 15:50:53 momjian Exp $
|
||||
* $Id: px.c,v 1.6 2001/11/20 18:54:07 momjian Exp $
|
||||
*/
|
||||
|
||||
#include <postgres.h>
|
||||
@ -50,13 +50,13 @@ px_resolve_alias(const PX_Alias * list, const char *name)
|
||||
* combo - cipher + padding (+ checksum)
|
||||
*/
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
combo_encrypt_len(PX_Combo * cx, unsigned dlen)
|
||||
{
|
||||
return dlen + 512;
|
||||
}
|
||||
|
||||
static uint
|
||||
static unsigned
|
||||
combo_decrypt_len(PX_Combo * cx, unsigned dlen)
|
||||
{
|
||||
return dlen;
|
||||
|
Loading…
Reference in New Issue
Block a user