From 90278430d91afa41aa35e852c34c8735c99d5fa7 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 1 Mar 2010 01:19:36 +0000 Subject: [PATCH] make USE_CRYPTODEV_DIGESTS work --- crypto/engine/eng_cryptodev.c | 8 +++++--- ssl/kssl.c | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c index b639df77a3..bc4b689230 100644 --- a/crypto/engine/eng_cryptodev.c +++ b/crypto/engine/eng_cryptodev.c @@ -90,7 +90,9 @@ static int get_asym_dev_crypto(void); static int open_dev_crypto(void); static int get_dev_crypto(void); 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_digests(const int **nids); static int cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, @@ -153,7 +155,7 @@ static struct { { 0, NID_undef, 0, 0, }, }; -#if 0 +#ifdef USE_CRYPTODEV_DIGESTS static struct { int id; int nid; @@ -259,13 +261,13 @@ get_cryptodev_ciphers(const int **cnids) return (count); } +#ifdef USE_CRYPTODEV_DIGESTS /* * 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! * returning them here is harmless, as long as we return NULL * when asked for a handler in the cryptodev_engine_digests routine */ -#if 0 /* not (yet?) used */ static int get_cryptodev_digests(const int **cnids) { diff --git a/ssl/kssl.c b/ssl/kssl.c index b5fa1f147d..4fb655285b 100644 --- a/ssl/kssl.c +++ b/ssl/kssl.c @@ -2090,9 +2090,12 @@ krb5_error_code kssl_check_authent( EVP_CIPHER_CTX_cleanup(&ciph_ctx); #ifdef KSSL_DEBUG + { + int padl; printf("kssl_check_authent: decrypted authenticator[%d] =\n", outl); for (padl=0; padl < outl; padl++) printf("%02x ",unenc_authent[padl]); printf("\n"); + } #endif /* KSSL_DEBUG */ if ((p = kssl_skip_confound(enctype, unenc_authent)) == NULL) -- 2.25.1