amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-27 17:12:43 +00:00
Code Issues Projects Releases Wiki Activity

(fix) enable S/MIME even when using GNU TLS (fixes #4201)

Browse Source
This commit is contained in:
Ludovic Marcotte
2017-07-04 11:00:06 -04:00
parent 721428c88f
commit 22c078ee76
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
UI/MailPartViewers/GNUmakefile.preamble
View File

@@ -1,3 +1,13 @@
ifeq ($(HAS_LIBRARY_gnutls),yes)
ADDITIONAL_CPPFLAGS += -DHAVE_GNUTLS=1
SOGo_LIBRARIES_DEPEND_UPON += -lgnutls
else
ifeq ($(HAS_LIBRARY_ssl),yes)
ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
endif
endif
ifeq ($(HAS_LIBRARY_ssl),yes)
ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
BUNDLE_LIBS += -lcrypto

6
UI/MailPartViewers/UIxMailPartSignedViewer.m
View File

@@ -18,7 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_OPENSSL
#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS)
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/pkcs7.h>
@@ -35,7 +36,8 @@
@implementation UIxMailPartSignedViewer : UIxMailPartMixedViewer
#ifdef HAVE_OPENSSL
#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS)
- (BOOL) supportsSMIME
{
return YES;