Skip to content
Permalink
Browse files
GEODE-7508: remove duplicate SSL keys (#609)
- Remove duplicate SSL keys, create new "master" dir for keys
- all tests now retrieve keys from source tree, rather than copying at config time
- individual keys needed in examples are now installed explicitly, rather than keeping copies in the example dirs in the source tree
- also fix formatting in SslTwoWayTest.cpp
  • Loading branch information
pdxcodemonkey committed Jun 3, 2020
1 parent a2a1044 commit ef435e18a842cdc7312ea522664b776bc654183d
Showing 49 changed files with 67 additions and 799 deletions.
@@ -386,6 +386,12 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/templates/ DESTINATION templates
PATTERN "templates/security/CMakeLists.txt.forInstall" EXCLUDE)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/security/CMakeLists.txt.forInstall RENAME CMakeLists.txt DESTINATION templates/security)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ssl_keys/server_keys/server_keystore_chained.p12 RENAME server_keystore.p12 DESTINATION examples/utilities/ServerSslKeys)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ssl_keys/server_keys/server_truststore_chained_root.jks RENAME server_truststore.jks DESTINATION examples/utilities/ServerSslKeys)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ssl_keys/client_keys/client_keystore_chained.pem RENAME client_keystore.pem DESTINATION examples/utilities/ClientSslKeys)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ssl_keys/client_keys/client_truststore_chained_root.pem RENAME client_truststore.pem DESTINATION examples/utilities/ClientSslKeys)

if (USE_RAT)
add_custom_target( rat-check
COMMAND ${CMAKE_COMMAND}
@@ -48,21 +48,13 @@ add_library( ${PROJECT_NAME} SHARED
packages.config
AutoSerializationTests.cs
SerializationTests.cs
ClientSslKeys/client_keystore.password.pem
ClientSslKeys/client_truststore.pem
ServerSslKeys/server_keystore.jks
ServerSslKeys/server_truststore.jks
)

set_source_files_properties(
cache.xml
server.xml
xunit.runner.json
geode.properties
ClientSslKeys/client_keystore.password.pem
ClientSslKeys/client_truststore.pem
ServerSslKeys/server_keystore.jks
ServerSslKeys/server_truststore.jks
PROPERTIES
VS_COPY_TO_OUT_DIR Always
VS_TOOL_OVERRIDE None
@@ -31,11 +31,11 @@ public class Config

public static string SslServerKeyPath
{
get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../cppcache/integration/test/ServerSslKeys"; }
get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../ssl_keys/server_keys"; }
}

public static string SslClientKeyPath
{
get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../cppcache/integration/test/ClientSslKeys"; }
get { return @"@CMAKE_CURRENT_SOURCE_DIR@/../../ssl_keys/client_keys"; }
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -22,6 +22,8 @@ const char *getFrameworkString(FrameworkVariable name) {
case FrameworkVariable::JavaObjectJarPath: return "@JAVAOBJECT_JAR_PATH@";
case FrameworkVariable::GfShExecutable: return "@Geode_gfsh_EXECUTABLE@";
case FrameworkVariable::TestCacheXmlDir: return "@CMAKE_CURRENT_SOURCE_DIR@/../../integration-test/resources";
case FrameworkVariable::TestClientSslKeysDir: return "@CMAKE_CURRENT_SOURCE_DIR@/../../../ssl_keys/client_keys";
case FrameworkVariable::TestServerSslKeysDir: return "@CMAKE_CURRENT_SOURCE_DIR@/../../../ssl_keys/server_keys";
default: return "";
}
}
@@ -20,7 +20,7 @@
#ifndef INTEGRATION_TEST_FRAMEWORK_CONFIG_H
#define INTEGRATION_TEST_FRAMEWORK_CONFIG_H

enum class FrameworkVariable {JavaObjectJarPath, GfShExecutable, TestCacheXmlDir};
enum class FrameworkVariable {JavaObjectJarPath, GfShExecutable, TestCacheXmlDir, TestClientSslKeysDir, TestServerSslKeysDir};

const char *getFrameworkString(FrameworkVariable name);

This file was deleted.

0 comments on commit ef435e1

Please sign in to comment.