oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

hcrypto compiler warnings

Browse Source
This commit is contained in:
Viktor Dukhovni
2016-11-14 14:55:53 +11:00
parent 17d6d0ac1e
commit e4ba666221
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hcrypto/evp-openssl.c
View File

@@ -407,12 +407,14 @@ get_EVP_MD(heim_base_once_t *once, hc_EVP_MD *hc_memoize,
#include "evp-hcrypto.h" #include "evp-hcrypto.h"
#define OSSL_CIPHER_ALGORITHM(name, flags) \ #define OSSL_CIPHER_ALGORITHM(name, flags) \
extern const hc_EVP_CIPHER *hc_EVP_ossl_##name(void); \
const hc_EVP_CIPHER *hc_EVP_ossl_##name(void) \ const hc_EVP_CIPHER *hc_EVP_ossl_##name(void) \
{ \ { \
return hc_EVP_hcrypto_##name(); \ return hc_EVP_hcrypto_##name(); \
} }
#define OSSL_MD_ALGORITHM(name) \ #define OSSL_MD_ALGORITHM(name) \
extern const hc_EVP_MD *hc_EVP_ossl_##name(void); \
const hc_EVP_MD *hc_EVP_ossl_##name(void) \ const hc_EVP_MD *hc_EVP_ossl_##name(void) \
{ \ { \
return hc_EVP_hcrypto_##name(); \ return hc_EVP_hcrypto_##name(); \

2
lib/hcrypto/rand.c
View File

@@ -53,7 +53,7 @@
* See the library functions here: @ref hcrypto_rand * See the library functions here: @ref hcrypto_rand
*/ */
const static RAND_METHOD *selected_meth = NULL; static const RAND_METHOD *selected_meth = NULL;
static ENGINE *selected_engine = NULL; static ENGINE *selected_engine = NULL;
static void static void

11
lib/hcrypto/validate.c
View File

@@ -60,7 +60,8 @@ static struct tests hc_tests[] = {
"\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",
16, 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",
"\xdc\x95\xc0\x78\xa2\x40\x89\x89\xad\x48\xa2\x14\x92\x84\x20\x87" "\xdc\x95\xc0\x78\xa2\x40\x89\x89\xad\x48\xa2\x14\x92\x84\x20\x87",
NULL
}, },
#if 0 #if 0
{ {
@@ -84,7 +85,8 @@ static struct tests hc_tests[] = {
"\xbf\x9a\x12\xb7\x26\x69\xfd\x05", "\xbf\x9a\x12\xb7\x26\x69\xfd\x05",
16, 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",
"\x55\x95\x97\x76\xa9\x6c\x66\x40\x64\xc7\xf4\x1c\x21\xb7\x14\x1b" "\x55\x95\x97\x76\xa9\x6c\x66\x40\x64\xc7\xf4\x1c\x21\xb7\x14\x1b",
NULL
}, },
#if 0 #if 0
{ {
@@ -205,7 +207,8 @@ static struct tests hc_tests[] = {
"\x89\x21\xc2\xf5\xa4\x63\x93\x8c" "\x89\x21\xc2\xf5\xa4\x63\x93\x8c"
"\xe0\x98\x22\x65\xee\xf7\x01\x79" "\xe0\x98\x22\x65\xee\xf7\x01\x79"
"\xbc\x55\x3f\x33\x9e\xb1\xa4\xc1" "\xbc\x55\x3f\x33\x9e\xb1\xa4\xc1"
"\xaf\x5f\x6a\x54\x7f" "\xaf\x5f\x6a\x54\x7f",
NULL
} }
}; };
@@ -247,8 +250,10 @@ test_cipher(struct tests *t)
if (memcmp(d, t->indata, t->datasize) != 0) if (memcmp(d, t->indata, t->datasize) != 0)
errx(1, "%s: decrypt not the same", t->name); errx(1, "%s: decrypt not the same", t->name);
#if 0
if (t->outiv) if (t->outiv)
/* XXXX check */; /* XXXX check */;
#endif
EVP_CIPHER_CTX_cleanup(&ectx); EVP_CIPHER_CTX_cleanup(&ectx);
EVP_CIPHER_CTX_cleanup(&dctx); EVP_CIPHER_CTX_cleanup(&dctx);