Mercurial > trustbridge

changeset 409:09bb19e5e369

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove m13 mentions and change test certificate to intevation.de
author Andre Heinecke <aheinecke@intevation.de>
date Wed, 16 Apr 2014 14:00:12 +0000
parents ac9e95ef6966
children 3132ba0a305d
files CMakeLists.txt ui/CMakeLists.txt ui/administrator.cpp ui/certificates/intevation.de.der ui/certificates/kolab.org.der ui/certs.qrc ui/downloader_win.cpp ui/main.cpp ui/mainwindow.cpp ui/sslconnection.cpp ui/tests/CMakeLists.txt
diffstat 11 files changed, 26 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Apr 16 13:41:10 2014 +0000
+++ b/CMakeLists.txt	Wed Apr 16 14:00:12 2014 +0000
@@ -6,7 +6,7 @@
 # See LICENSE.txt for details.
 
 cmake_minimum_required(VERSION 2.8.8)
-project(m13)
+project(trustbridge)
 
 option(DO_RELEASE_BUILD "Build for a public release." OFF)
 option(ENABLE_PROFILING "Set to enable profiling." OFF)
--- a/ui/CMakeLists.txt	Wed Apr 16 13:41:10 2014 +0000
+++ b/ui/CMakeLists.txt	Wed Apr 16 14:00:12 2014 +0000
@@ -91,8 +91,8 @@
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 
-generate_cppcheck(SOURCES ${CINST_SOURCES} ${TRUSTBRIDGE_SOURCES} TARGET_NAME m13_cppcheck)
-add_dependencies(static_check m13_cppcheck)
+generate_cppcheck(SOURCES ${CINST_SOURCES} ${TRUSTBRIDGE_SOURCES} TARGET_NAME custom_cppcheck)
+add_dependencies(static_check custom_cppcheck)
 
 # Adding resources here in an extra variable to enable reuse of
 # TRUSTBRIDGE_SOURCES in the test subdirectory.
--- a/ui/administrator.cpp	Wed Apr 16 13:41:10 2014 +0000
+++ b/ui/administrator.cpp	Wed Apr 16 14:00:12 2014 +0000
@@ -21,7 +21,7 @@
 #endif
 
 #ifndef ORGANIZATION
-#define ORGANIZATION "m13org"
+#define ORGANIZATION "BSI"
 #endif
 
 #ifdef Q_OS_WIN
Binary file ui/certificates/intevation.de.der has changed
Binary file ui/certificates/kolab.org.der has changed
--- a/ui/certs.qrc	Wed Apr 16 13:41:10 2014 +0000
+++ b/ui/certs.qrc	Wed Apr 16 14:00:12 2014 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/certs">
-    <file alias="kolab.org">certificates/kolab.org.der</file>
+    <file alias="intevation.de">certificates/intevation.de.der</file>
 </qresource>
 </RCC>
--- a/ui/downloader_win.cpp	Wed Apr 16 13:41:10 2014 +0000
+++ b/ui/downloader_win.cpp	Wed Apr 16 14:00:12 2014 +0000
@@ -157,7 +157,7 @@
         }
 
         if (proxyConfig.lpszProxy) {
-            *pHSession = WinHttpOpen(L"M13 "MYVERSION,
+            *pHSession = WinHttpOpen(L"TrustBridge "MYVERSION,
                                      WINHTTP_ACCESS_TYPE_NAMED_PROXY,
                                      proxyConfig.lpszProxy,
                                      proxyConfig.lpszProxyBypass, 0);
@@ -166,7 +166,7 @@
 
     if (!*pHSession) {
         DEBUG << "No IE Proxy falling back to default proxy";
-        *pHSession = WinHttpOpen(L"M13 "MYVERSION,
+        *pHSession = WinHttpOpen(L"TrustBridge "MYVERSION,
                                  WINHTTP_ACCESS_TYPE_DEFAULT_PROXY,
                                  WINHTTP_NO_PROXY_NAME,
                                  WINHTTP_NO_PROXY_BYPASS, 0);
--- a/ui/main.cpp	Wed Apr 16 13:41:10 2014 +0000
+++ b/ui/main.cpp	Wed Apr 16 14:00:12 2014 +0000
@@ -22,7 +22,7 @@
 #endif
 
 #ifndef ORGANIZATION
-#define ORGANIZATION "m13org"
+#define ORGANIZATION "BSI"
 #endif
 
 #ifdef Q_OS_WIN
--- a/ui/mainwindow.cpp	Wed Apr 16 13:41:10 2014 +0000
+++ b/ui/mainwindow.cpp	Wed Apr 16 14:00:12 2014 +0000
@@ -29,9 +29,13 @@
 // something to say
 #define NAG_INTERVAL_MINUTES 60
 
-#define SERVER_URL "https://files.kolab.org:443"
-#define LIST_RESOURCE "/incoming/aheinecke/test"
-#define SW_RESOURCE "/incoming/aheinecke/test"
+#ifndef APPNAME
+#define APPNAME "TrustBridge"
+#endif
+
+#define SERVER_URL "https://files.intevation.de:443"
+#define LIST_RESOURCE "/users/aheinecke/zertifikatsliste_1.txt"
+#define SW_RESOURCE   "/users/aheinecke/zertifikatsliste_1.txt"
 
 #include "certificatelist.h"
 #include "downloader.h"
@@ -298,7 +302,7 @@
     QLabel *logo = new QLabel;
     logo->setBackgroundRole(QPalette::Base);
     logo->setPixmap(QPixmap::fromImage(*logoImage));
-    QLabel *title = new QLabel("<h2>" + tr("Certificate Installer") + "</h2>");
+    QLabel *title = new QLabel("<h2>" + QString::fromLatin1(APPNAME) + "</h2>");
     QLabel *subTitle = new QLabel("This Software installs and removes Certificates");
     headerTextLayout->addWidget(title);
     headerTextLayout->addWidget(subTitle);
--- a/ui/sslconnection.cpp	Wed Apr 16 13:41:10 2014 +0000
+++ b/ui/sslconnection.cpp	Wed Apr 16 14:00:12 2014 +0000
@@ -47,7 +47,7 @@
     memset(&mSavedSession, 0, sizeof( ssl_session ) );
 
     if (certificate.isEmpty()) {
-        QFile certResource(":certs/kolab.org");
+        QFile certResource(":certs/intevation.de");
         certResource.open(QFile::ReadOnly);
         mPinnedCert = certResource.readAll();
         certResource.close();
--- a/ui/tests/CMakeLists.txt	Wed Apr 16 13:41:10 2014 +0000
+++ b/ui/tests/CMakeLists.txt	Wed Apr 16 14:00:12 2014 +0000
@@ -22,7 +22,7 @@
   add_definitions(-DHIAWATHA_EXECUTABLE="${HIAWATHA_EXECUTABLE}")
 endif()
 
-macro(add_m13_test _source _additional_sources)
+macro(add_custom_test _source _additional_sources)
   set(_test ${_source})
   get_filename_component(_name ${_source} NAME_WE)
   set(_test_sources_with_resources ${_test}
@@ -30,7 +30,7 @@
   qt5_add_resources(_test_sources_with_resources
      ${CMAKE_CURRENT_SOURCE_DIR}/data/testdata.qrc)
   add_executable(${_name} ${_test_sources_with_resources})
-  add_test(m13-${_name} ${_name})
+  add_test(tb-${_name} ${_name})
   target_link_libraries(${_name} Qt5::Test Qt5::Widgets
      trustbridge_common
      ${POLARSSL_LIBRARIES}
@@ -40,22 +40,22 @@
 # Add the current source dir to the definition
 # so that it can be used in file names in the tests.
 add_definitions(-DSOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
-add_m13_test(certlistparsertest.cpp "${CERTIFICATELIST_SOURCES}")
+add_custom_test(certlistparsertest.cpp "${CERTIFICATELIST_SOURCES}")
 
 # Downloader
 if (HIAWATHA_EXECUTABLE)
   set(DOWNLOADER_SOURCES_WITH_RESOURCES ${DOWNLOADER_SOURCES})
   qt5_add_resources(DOWNLOADER_SOURCES_WITH_RESOURCES ${TRUSTBRIDGE_RESOURCES})
-  add_m13_test(downloadertest.cpp "${DOWNLOADER_SOURCES_WITH_RESOURCES}")
+  add_custom_test(downloadertest.cpp "${DOWNLOADER_SOURCES_WITH_RESOURCES}")
 endif()
 
 # Cinstprocess
-add_m13_test(cinstprocesstest.cpp "${CERTIFICATELIST_SOURCES}")
+add_custom_test(cinstprocesstest.cpp "${CERTIFICATELIST_SOURCES}")
 add_dependencies(cinstprocesstest cinst)
-add_m13_test(commontest.cpp "")
+add_custom_test(commontest.cpp "")
 
 if (WIN32)
-   add_m13_test(windowsstoretest.cpp "${CERTIFICATELIST_SOURCES};${CMAKE_SOURCE_DIR}/cinst/windowsstore.c")
+   add_custom_test(windowsstoretest.cpp "${CERTIFICATELIST_SOURCES};${CMAKE_SOURCE_DIR}/cinst/windowsstore.c")
 endif (WIN32)
 
 if (NSS_FOUND)
@@ -64,7 +64,7 @@
       ${CERTIFICATELIST_SOURCES}
       ${CMAKE_SOURCE_DIR}/cinst/nssstore_linux.c
       ${CMAKE_SOURCE_DIR}/cinst/nssstore_win.c)
-   add_m13_test(nsstest.cpp "${NSSTEST_SOURCES}")
+   add_custom_test(nsstest.cpp "${NSSTEST_SOURCES}")
    target_link_libraries(nsstest ${NSS_LIBRARIES})
    if (WIN32)
       target_link_libraries(nsstest -luserenv)
@@ -73,5 +73,5 @@
    add_dependencies(nsstest mozilla)
 endif()
 
-#add_m13_test(${CMAKE_SOURCE_DIR}/ui/main.cpp "${TRUSTBRIDGE_SOURCES}")
+#add_custom_test(${CMAKE_SOURCE_DIR}/ui/main.cpp "${TRUSTBRIDGE_SOURCES}")
http://wald.intevation.org/projects/trustbridge/