Less "pointer targets in passing argument differ in signedness" warnings.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17509 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -42,11 +42,11 @@ RCSID("$Id$");
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
const char *key;
|
const void *key;
|
||||||
const int keylen;
|
const int keylen;
|
||||||
const int bitsize;
|
const int bitsize;
|
||||||
const char *plain;
|
const void *plain;
|
||||||
const char *cipher;
|
const void *cipher;
|
||||||
} tests[] = {
|
} tests[] = {
|
||||||
{
|
{
|
||||||
"\x00\x00\x00\x00\x00\x00\x00\x00"
|
"\x00\x00\x00\x00\x00\x00\x00\x00"
|
||||||
@@ -103,12 +103,12 @@ struct {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const char cbc_key[16] =
|
const unsigned char cbc_key[16] =
|
||||||
"\x00\x00\x00\x00\x00\x00\x00\x00"
|
"\x00\x00\x00\x00\x00\x00\x00\x00"
|
||||||
"\x00\x00\x00\x00\x00\x00\x00\x00";
|
"\x00\x00\x00\x00\x00\x00\x00\x00";
|
||||||
const char cbc_iv[8] =
|
const char cbc_iv[8] =
|
||||||
"\x01\x01\x01\x01\x01\x01\x01\x01";
|
"\x01\x01\x01\x01\x01\x01\x01\x01";
|
||||||
const char cbc_in_data[32] =
|
const unsigned char cbc_in_data[32] =
|
||||||
"\x20\x20\x20\x20\x20\x20\x20\x20"
|
"\x20\x20\x20\x20\x20\x20\x20\x20"
|
||||||
"\x20\x20\x20\x20\x20\x20\x20\x20"
|
"\x20\x20\x20\x20\x20\x20\x20\x20"
|
||||||
"\x20\x20\x20\x20\x20\x20\x20\x20"
|
"\x20\x20\x20\x20\x20\x20\x20\x20"
|
||||||
|
@@ -144,7 +144,7 @@ const unsigned char cipher3[] =
|
|||||||
int
|
int
|
||||||
main (void)
|
main (void)
|
||||||
{
|
{
|
||||||
char buf[1024];
|
unsigned char buf[1024];
|
||||||
RC4_KEY key;
|
RC4_KEY key;
|
||||||
|
|
||||||
RC4_set_key(&key, 8, key1);
|
RC4_set_key(&key, 8, key1);
|
||||||
|
@@ -472,8 +472,9 @@ char *aes_key2 =
|
|||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
samep(int testn, char *type, const char *p1, const char *p2, size_t len)
|
samep(int testn, char *type, const void *pp1, const void *pp2, size_t len)
|
||||||
{
|
{
|
||||||
|
const unsigned char *p1 = pp1, *p2 = pp2;
|
||||||
size_t i;
|
size_t i;
|
||||||
int val = 1;
|
int val = 1;
|
||||||
|
|
||||||
@@ -493,13 +494,13 @@ samep(int testn, char *type, const char *p1, const char *p2, size_t len)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
encryption_test(krb5_context context, char *key, size_t keylen,
|
encryption_test(krb5_context context, const void *key, size_t keylen,
|
||||||
struct enc_test *enc, int numenc)
|
struct enc_test *enc, int numenc)
|
||||||
{
|
{
|
||||||
char iv[AES_BLOCK_SIZE];
|
unsigned char iv[AES_BLOCK_SIZE];
|
||||||
int i, val, failed = 0;
|
int i, val, failed = 0;
|
||||||
AES_KEY ekey, dkey;
|
AES_KEY ekey, dkey;
|
||||||
char *p;
|
unsigned char *p;
|
||||||
|
|
||||||
AES_set_encrypt_key(key, keylen, &ekey);
|
AES_set_encrypt_key(key, keylen, &ekey);
|
||||||
AES_set_decrypt_key(key, keylen, &dkey);
|
AES_set_decrypt_key(key, keylen, &dkey);
|
||||||
|
Reference in New Issue
Block a user