import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@

1 files changed, 8 insertions, 4 deletions

diff --git a/src/lib/libcrypto/engine/hw_cryptodev.c b/src/lib/libcrypto/engine/hw_cryptodev.c
index 467c0daa1b..3e7fff1c1e 100644
--- a/src/lib/libcrypto/engine/hw_cryptodev.c
+++ b/src/lib/libcrypto/engine/hw_cryptodev.c
@@ -77,7 +77,7 @@ static int cryptodev_max_iv(int cipher);
 static int cryptodev_key_length_valid(int cipher, int len);
 static int cipher_nid_to_cryptodev(int nid);
 static int get_cryptodev_ciphers(const int **cnids);
-static int get_cryptodev_digests(const int **cnids);
+/*static int get_cryptodev_digests(const int **cnids);*/
 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,
@@ -137,6 +137,7 @@ static struct {
         { 0,                            NID_undef,              0,       0, },
 };
 
+#if 0 /* UNUSED */
 static struct {
         int     id;
         int     nid;
@@ -149,6 +150,7 @@ static struct {
         { CRYPTO_SHA1,                  NID_undef,              },
         { 0,                            NID_undef,              },
 };
+#endif
 
 /*
  * Return a fd if /dev/crypto seems usable, 0 otherwise.
@@ -258,7 +260,7 @@ get_cryptodev_ciphers(const int **cnids)
         int fd, i, count = 0;
 
         if ((fd = get_dev_crypto()) < 0) {
-                *nids = NULL;
+                *cnids = NULL;
                 return (0);
         }
         memset(&sess, 0, sizeof(sess));
@@ -289,6 +291,7 @@ get_cryptodev_ciphers(const int **cnids)
  * returning them here is harmless, as long as we return NULL
  * when asked for a handler in the cryptodev_engine_digests routine
  */
+#if 0 /* UNUSED */
 static int
 get_cryptodev_digests(const int **cnids)
 {
@@ -297,7 +300,7 @@ get_cryptodev_digests(const int **cnids)
         int fd, i, count = 0;
 
         if ((fd = get_dev_crypto()) < 0) {
-                *nids = NULL;
+                *cnids = NULL;
                 return (0);
         }
         memset(&sess, 0, sizeof(sess));
@@ -318,6 +321,7 @@ get_cryptodev_digests(const int **cnids)
                 *cnids = NULL;
         return (count);
 }
+#endif
 
 /*
  * Find the useable ciphers|digests from dev/crypto - this is the first
@@ -623,7 +627,7 @@ static int
 bn2crparam(const BIGNUM *a, struct crparam *crp)
 {
         int i, j, k;
-        ssize_t words, bytes, bits;
+        ssize_t bytes, bits;
         u_char *b;
 
         crp->crp_p = NULL;