make USE_CRYPTODEV_DIGESTS work

This commit is contained in:
Dr. Stephen Henson 2010-03-01 01:19:36 +00:00
parent bcd9d12a8d
commit 90278430d9
2 changed files with 8 additions and 3 deletions

View File

@ -90,7 +90,9 @@ static int get_asym_dev_crypto(void);
static int open_dev_crypto(void); static int open_dev_crypto(void);
static int get_dev_crypto(void); static int get_dev_crypto(void);
static int get_cryptodev_ciphers(const int **cnids); static int get_cryptodev_ciphers(const int **cnids);
/*static int get_cryptodev_digests(const int **cnids);*/ #ifdef USE_CRYPTODEV_DIGESTS
static int get_cryptodev_digests(const int **cnids);
#endif
static int cryptodev_usable_ciphers(const int **nids); static int cryptodev_usable_ciphers(const int **nids);
static int cryptodev_usable_digests(const int **nids); static int cryptodev_usable_digests(const int **nids);
static int cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, static int cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
@ -153,7 +155,7 @@ static struct {
{ 0, NID_undef, 0, 0, }, { 0, NID_undef, 0, 0, },
}; };
#if 0 #ifdef USE_CRYPTODEV_DIGESTS
static struct { static struct {
int id; int id;
int nid; int nid;
@ -259,13 +261,13 @@ get_cryptodev_ciphers(const int **cnids)
return (count); return (count);
} }
#ifdef USE_CRYPTODEV_DIGESTS
/* /*
* Find out what digests /dev/crypto will let us have a session for. * Find out what digests /dev/crypto will let us have a session for.
* XXX note, that some of these openssl doesn't deal with yet! * XXX note, that some of these openssl doesn't deal with yet!
* returning them here is harmless, as long as we return NULL * returning them here is harmless, as long as we return NULL
* when asked for a handler in the cryptodev_engine_digests routine * when asked for a handler in the cryptodev_engine_digests routine
*/ */
#if 0 /* not (yet?) used */
static int static int
get_cryptodev_digests(const int **cnids) get_cryptodev_digests(const int **cnids)
{ {

View File

@ -2090,9 +2090,12 @@ krb5_error_code kssl_check_authent(
EVP_CIPHER_CTX_cleanup(&ciph_ctx); EVP_CIPHER_CTX_cleanup(&ciph_ctx);
#ifdef KSSL_DEBUG #ifdef KSSL_DEBUG
{
int padl;
printf("kssl_check_authent: decrypted authenticator[%d] =\n", outl); printf("kssl_check_authent: decrypted authenticator[%d] =\n", outl);
for (padl=0; padl < outl; padl++) printf("%02x ",unenc_authent[padl]); for (padl=0; padl < outl; padl++) printf("%02x ",unenc_authent[padl]);
printf("\n"); printf("\n");
}
#endif /* KSSL_DEBUG */ #endif /* KSSL_DEBUG */
if ((p = kssl_skip_confound(enctype, unenc_authent)) == NULL) if ((p = kssl_skip_confound(enctype, unenc_authent)) == NULL)