From 502cc61711173273ffb8be2cf895f5e79c3b47bc Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Wed, 26 Apr 2017 07:33:25 +0200 Subject: Move RSA key loading and decryption functions to wsutil Loading PEM and PKCS#11 keys was being done in static functions in packet-ssl-utils.c. These were moved to wsutil, with prototypes in a new header. This adds gnutls as optional dependency to wsutil. The RSA decryption helper was also moved and is now provided in . This allows more dissectors to access this functionality. Change-Id: I6cfbbf5203f2881c82bad721747834ccd76e2033 Reviewed-on: https://code.wireshark.org/review/21941 Reviewed-by: Peter Wu Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- wsutil/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'wsutil/Makefile.am') diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index 28f04c5be0..cb409f7f4d 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -26,7 +26,8 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL \ -DEXTCAP_DIR=\"$(extcapdir)\" \ -DPLUGIN_INSTALL_DIR=\"$(plugindir)\" \ -DJSMN_STRICT \ - $(GLIB_CFLAGS) $(LIBGCRYPT_CFLAGS) + $(GLIB_CFLAGS) $(LIBGCRYPT_CFLAGS) \ + $(LIBGNUTLS_CFLAGS) # Optional headers for ABI checking wsutil_optional_abi_includes = @@ -144,6 +145,7 @@ libwsutil_la_SOURCES = \ plugins.c \ privileges.c \ report_message.c \ + rsa.c \ sober128.c \ str_util.c \ strtoi.c \ @@ -174,6 +176,7 @@ libwsutil_la_LIBADD = \ @COREFOUNDATION_FRAMEWORKS@ \ @GLIB_LIBS@ \ @LIBGCRYPT_LIBS@ \ + @LIBGNUTLS_LIBS@ \ $(wsutil_optional_objects) EXTRA_libwsutil_la_DEPENDENCIES = \ @@ -195,6 +198,7 @@ EXTRA_DIST = \ inet_pton.c \ popcount.c \ popcount.h \ + rsa.h \ strptime.c \ strptime.h \ win32-utils.c \ -- cgit v1.2.1