From 99ebd385d7f69067c46eb8d5541a06b670df0d1d Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 6 Jul 2021 02:19:09 +0200
Subject: [PATCH] WIP: conan
---
.docker/cert.sh | 1 +
.gitignore | 1 +
test/test_connection.cpp | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.docker/cert.sh b/.docker/cert.sh
index e22cfba..efc660b 100755
--- a/.docker/cert.sh
+++ b/.docker/cert.sh
@@ -43,6 +43,7 @@ function cert() {
# Certificate is for localhost
KEYPW="${KEYPW}" openssl req -new -x509 -key caosdb.key.pem \
-out caosdb.cert.pem -passin env:KEYPW \
+ -addext "subjectAltName = DNS:${CAOSHOSTNAME}" \
-subj "/C=/ST=/L=/O=/OU=/CN=${CAOSHOSTNAME}"
KEYPW="${KEYPW}" KEYSTOREPW="$KEYSTOREPW" openssl pkcs12 -export \
-inkey caosdb.key.pem -in caosdb.cert.pem -out all-certs.pkcs12 \
diff --git a/.gitignore b/.gitignore
index 33eb35c..f5e46b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
# General
build/
include/libcaosdbConfig.h
+cert/
.*
# CMake
diff --git a/test/test_connection.cpp b/test/test_connection.cpp
index f2bc829..4b62179 100644
--- a/test/test_connection.cpp
+++ b/test/test_connection.cpp
@@ -76,7 +76,7 @@ TEST(test_connection, connection_ssl_authentication_error) {
}
TEST(test_connection, connection_ssl_authentication_success) {
- auto port = 8443;
+ auto port = 8080;
const auto host = caosdb::utils::get_env_var("CAOSDB_SERVER_HOST", "localhost");
const auto path = caosdb::utils::get_env_var("CAOSDB_SERVER_CA_PEM", std::string());
const auto user = caosdb::utils::get_env_var("CAOSDB_USER", "admin");
--
GitLab