diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-12-24 15:15:29 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-12-24 15:15:29 +0000 |
| commit | ad5d1b910587d67affa085d668e8153a50c0b8d6 (patch) | |
| tree | 957d7367a7363ef85b6d5803f4f2084097e2c509 /epan/dissectors/packet-ssl-utils.c | |
| parent | 7c5dc6d5660c33aba741fbb4692dce3c91b4d48a (diff) | |
From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()
initialize all variables
svn path=/trunk/; revision=54443
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 67d283bdc6..8cf0457ce5 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1610,19 +1610,14 @@ _gcry_rsa_decrypt (int algo, gcry_mpi_t *result, gcry_mpi_t *data, static int ssl_private_decrypt(guint len, guchar* encr_data, SSL_PRIVATE_KEY* pk) { - gint rc; - size_t decr_len; - gcry_sexp_t s_data, s_plain; - gcry_mpi_t encr_mpi; - size_t i, encr_len; - guchar* decr_data_ptr; - gcry_mpi_t text; - decr_len = 0; - encr_len = len; - text = NULL; + gint rc = 0; + size_t decr_len = 0, i = 0; + gcry_sexp_t s_data = NULL, s_plain = NULL; + gcry_mpi_t encr_mpi = NULL, text = NULL; + guchar* decr_data_ptr = NULL; /* build up a mpi rappresentation for encrypted data */ - rc = gcry_mpi_scan(&encr_mpi, GCRYMPI_FMT_USG,encr_data, encr_len, &encr_len); + rc = gcry_mpi_scan(&encr_mpi, GCRYMPI_FMT_USG, encr_data, len, NULL); if (rc != 0 ) { ssl_debug_printf("pcry_private_decrypt: can't convert encr_data to mpi (size %d):%s\n", len, gcry_strerror(rc)); |