--- a/CMakeLists.txt	Thu Feb 20 10:57:20 2014 +0000
+++ b/CMakeLists.txt	Thu Feb 20 10:58:28 2014 +0000
@@ -17,14 +17,21 @@
 include_directories(${Qt5Widgets_INCLUDE_DIRS})
 add_definitions(${Qt5Widgets_DEFINITIONS})
 
+set(CERTIFICATELIST_SOURCES
+    ${CMAKE_SOURCE_DIR}/ui/certificatelist.cpp
+    ${CMAKE_SOURCE_DIR}/ui/certificate.cpp
+    ${CMAKE_SOURCE_DIR}/ui/certificate_win.cpp
+    ${CMAKE_SOURCE_DIR}/ui/certificate_linux.cpp
+    ${CMAKE_SOURCE_DIR}/cinst/listutil.c
+)
+
 set(M13UI_SOURCES
     ${CMAKE_SOURCE_DIR}/ui/mainwindow.cpp
-    ${CMAKE_SOURCE_DIR}/ui/certificatelist.cpp
     ${CMAKE_SOURCE_DIR}/ui/downloader.cpp
     ${CMAKE_SOURCE_DIR}/ui/downloader_win.cpp
     ${CMAKE_SOURCE_DIR}/ui/downloader_linux.cpp
-    ${CMAKE_SOURCE_DIR}/cinst/listutil.c
     ${CMAKE_SOURCE_DIR}/ui/main.cpp
+    ${CERTIFICATELIST_SOURCES}
 )
 
 # Seperated to make it easier to include the sources in tests
@@ -39,7 +46,7 @@
 set(WARN_HARDENING_FLAGS " -Wextra -Wconversion -Wformat-security")
 
 # Hardening flags
-set(HARDENING_FLAGS " -Wall -Werror -fstack-protector-all")
+set(HARDENING_FLAGS " -Wall -Werror -fstack-protector-all -fno-exceptions")
 set(HARDENING_FLAGS " ${HARDENING_FLAGS} -Wstack-protector")
 set(HARDENING_FLAGS " ${HARDENING_FLAGS} --param ssp-buffer-size=4")
 set(HARDENING_FLAGS " ${HARDENING_FLAGS} -D_FORTIFY_SOURCE=2 -O2")