forked from osmocom/wireshark
fix compilation without GnuTLS
svn path=/trunk/; revision=20305
This commit is contained in:
parent
b9f69234ad
commit
8e6556a3ee
|
@ -150,7 +150,7 @@ ssl_md5_cleanup(SSL_MD5_CTX* md)
|
||||||
}
|
}
|
||||||
|
|
||||||
gint
|
gint
|
||||||
ssl_cipher_setiv(gcry_cipher_hd_t *cipher,guchar* iv, gint iv_len)
|
ssl_cipher_setiv(SSL_CIPHER_CTX *cipher, guchar* iv, gint iv_len)
|
||||||
{
|
{
|
||||||
/* guchar * ivp; */
|
/* guchar * ivp; */
|
||||||
gint ret;
|
gint ret;
|
||||||
|
@ -1355,6 +1355,13 @@ ssl_decrypt_record(SslDecryptSession*ssl, SslDecoder* decoder, gint ct,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gint
|
||||||
|
ssl_cipher_setiv(SSL_CIPHER_CTX *cipher, guchar* iv, gint iv_len)
|
||||||
|
{
|
||||||
|
ssl_debug_printf("ssl_cipher_setiv: impossible without glutls.\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* HAVE_LIBGNUTLS */
|
#endif /* HAVE_LIBGNUTLS */
|
||||||
|
|
||||||
/* get ssl data for this session. if no ssl data is found allocate a new one*/
|
/* get ssl data for this session. if no ssl data is found allocate a new one*/
|
||||||
|
|
|
@ -692,7 +692,7 @@ extern void
|
||||||
ssl_data_set(StringInfo* buf, const guchar* src, guint len);
|
ssl_data_set(StringInfo* buf, const guchar* src, guint len);
|
||||||
|
|
||||||
extern gint
|
extern gint
|
||||||
ssl_cipher_setiv(gcry_cipher_hd_t *cipher,guchar* iv, gint iv_len);
|
ssl_cipher_setiv(SSL_CIPHER_CTX *cipher, guchar* iv, gint iv_len);
|
||||||
|
|
||||||
/** Load an RSA private key from specified file
|
/** Load an RSA private key from specified file
|
||||||
@param fp the file that contain the key data
|
@param fp the file that contain the key data
|
||||||
|
|
Loading…
Reference in New Issue