From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589

Enhance SSL dissector : fix ssl_private_decrypt()

remove unused functions and a #define

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54442 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 6d483fb5fe17933ea923ce7584d48e569d6cab3b..67d283bdc66e8d8ccd8d3d7d394886d741590c66 100644 (file)
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -1601,38 +1601,10 @@ ssl_cipher_cleanup(gcry_cipher_hd_t *cipher)
     *cipher = NULL;
 }
 
-#if 0
-/* private key abstraction layer */
-static inline gint
-ssl_get_key_len(SSL_PRIVATE_KEY* pk) {return gcry_pk_get_nbits (pk); }
-#endif
-
 gcry_err_code_t
 _gcry_rsa_decrypt (int algo, gcry_mpi_t *result, gcry_mpi_t *data,
                    gcry_mpi_t *skey, gint flags);
 
-#define PUBKEY_FLAG_NO_BLINDING (1 << 0)
-#if 0
-static const gchar*
-ssl_private_key_to_str(SSL_PRIVATE_KEY* pk)
-{
-    const gchar *str = "NULL";
-    size_t       n;
-    gchar       *buf;
-
-    if (!pk) return str;
-#ifndef SSL_FAST
-    n = gcry_sexp_sprint(pk, GCRYSEXP_FMT_ADVANCED, NULL, 0);
-    buf = (gchar *)ep_alloc(n);
-    /*n = gcry_sexp_sprint(pk, GCRYSEXP_FMT_ADVANCED, buf, n);*/
-    str = buf;
-#else /* SSL_FAST */
-    str = "TO DO: dump mpi gcry_mpi_print()";
-#endif /* SSL_FAST */
-    return str;
-}
-#endif
-
 /* decrypt data with private key. Store decrypted data directly into input
  * buffer */
 static int
@@ -1657,8 +1629,6 @@ ssl_private_decrypt(guint len, guchar* encr_data, SSL_PRIVATE_KEY* pk)
         return 0;
     }
 
-    /*ssl_debug_printf("pcry_private_decrypt: pk=%s\n", ssl_private_key_to_str(pk));*/
-
 #ifndef SSL_FAST
     /* put the data into a simple list */
     rc = gcry_sexp_build(&s_data, NULL, "(enc-val(rsa(a%m)))", encr_mpi);