Skip to content

Commit 38bc8b3

Browse files
rcsanchez97kevinAlbs
authored andcommitted
CDRIVER-2505 fix paths to X.509 certs
1 parent 34b3b22 commit 38bc8b3

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.evergreen/integration-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if [ ! -z "$AUTHSOURCE" ]; then
4848
fi
4949

5050
if [ "$SSL" != "nossl" ]; then
51-
cp -f tests/x509gen/* $MONGO_ORCHESTRATION_HOME/lib/
51+
cp -f src/libmongoc/tests/x509gen/* $MONGO_ORCHESTRATION_HOME/lib/
5252
# find print0 and xargs -0 not available on Solaris. Lets hope for good paths
5353
find orchestration_configs -name \*.json | xargs perl -p -i -e "s|/tmp/orchestration-home|$MONGO_ORCHESTRATION_HOME/lib|g"
5454
ORCHESTRATION_FILE="${ORCHESTRATION_FILE}-ssl"

.evergreen/link-sample-program-msvc.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ if "%LINK_STATIC%"=="1" (
8585
cd %EXAMPLE_DIR%
8686

8787
if "%ENABLE_SSL%"=="1" (
88-
cp ..\..\..\tests\x509gen\client.pem .
89-
cp ..\..\..\tests\x509gen\ca.pem .
88+
cp ..\..\..\src\libmongoc\tests\x509gen\client.pem .
89+
cp ..\..\..\src\libmongoc\tests\x509gen\ca.pem .
9090
set MONGODB_EXAMPLE_URI="mongodb://localhost/?ssl=true&sslclientcertificatekeyfile=client.pem&sslcertificateauthorityfile=ca.pem&sslallowinvalidhostnames=true"
9191
)
9292

.evergreen/run-auth-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if [ $SSL -eq 1 ]; then
7575
# FIXME: CDRIVER-2008
7676
if [ "${OS%_*}" != "cygwin" ]; then
7777
echo "Authenticating using X.509"
78-
$PING "mongodb://CN=client,OU=kerneluser,O=10Gen,L=New York City,ST=New York,C=US@${AUTH_HOST}/?ssl=true&authMechanism=MONGODB-X509&sslClientCertificateKeyFile=./tests/x509gen/legacy-x509.pem&sslCertificateAuthorityFile=tests/x509gen/legacy-ca.crt&sslAllowInvalidHostnames=true&${C_TIMEOUT}"
78+
$PING "mongodb://CN=client,OU=kerneluser,O=10Gen,L=New York City,ST=New York,C=US@${AUTH_HOST}/?ssl=true&authMechanism=MONGODB-X509&sslClientCertificateKeyFile=./src/libmongoc/tests/x509gen/legacy-x509.pem&sslCertificateAuthorityFile=src/libmongoc/tests/x509gen/legacy-ca.crt&sslAllowInvalidHostnames=true&${C_TIMEOUT}"
7979
fi
8080
if [ "${OBSOLETE_TLS}" != "true" ]; then
8181
echo "Connecting to Atlas Free Tier"

.evergreen/run-tests.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ fi
2525

2626
if [ "$SSL" != "nossl" ]; then
2727
export MONGOC_TEST_SSL_WEAK_CERT_VALIDATION="on"
28-
export MONGOC_TEST_SSL_PEM_FILE="tests/x509gen/client.pem"
29-
sudo cp tests/x509gen/ca.pem /usr/local/share/ca-certificates/cdriver.crt || true
28+
export MONGOC_TEST_SSL_PEM_FILE="src/libmongoc/tests/x509gen/client.pem"
29+
sudo cp src/libmongoc/tests/x509gen/ca.pem /usr/local/share/ca-certificates/cdriver.crt || true
3030
if [ -f /usr/local/share/ca-certificates/cdriver.crt ]; then
3131
sudo update-ca-certificates
3232
else
33-
export MONGOC_TEST_SSL_CA_FILE="tests/x509gen/ca.pem"
33+
export MONGOC_TEST_SSL_CA_FILE="src/libmongoc/tests/x509gen/ca.pem"
3434
fi
3535
fi
3636

0 commit comments

Comments
 (0)