projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More typo fixes
[oweals/openssl.git]
/
test
/
ssl-tests
/
03-custom_verify.conf
diff --git
a/test/ssl-tests/03-custom_verify.conf
b/test/ssl-tests/03-custom_verify.conf
index 7bb90037d0ad3b96a4880bff629ca8732a3acb34..8dca715e74da8c26fc3e80f4d89ddc1453345674 100644
(file)
--- a/
test/ssl-tests/03-custom_verify.conf
+++ b/
test/ssl-tests/03-custom_verify.conf
@@
-18,7
+18,6
@@
ssl_conf = 0-verify-success-ssl
[0-verify-success-ssl]
server = 0-verify-success-server
[0-verify-success-ssl]
server = 0-verify-success-server
-server2 = 0-verify-success-server2
client = 0-verify-success-client
[0-verify-success-server]
client = 0-verify-success-client
[0-verify-success-server]
@@
-26,19
+25,11
@@
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[0-verify-success-server2]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-
[0-verify-success-client]
CipherString = DEFAULT
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[0-verify-success-client]
CipherString = DEFAULT
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-
[test-0]
ExpectedResult = Success
[test-0]
ExpectedResult = Success
@@
-50,7
+41,6
@@
ssl_conf = 1-verify-custom-reject-ssl
[1-verify-custom-reject-ssl]
server = 1-verify-custom-reject-server
[1-verify-custom-reject-ssl]
server = 1-verify-custom-reject-server
-server2 = 1-verify-custom-reject-server2
client = 1-verify-custom-reject-client
[1-verify-custom-reject-server]
client = 1-verify-custom-reject-client
[1-verify-custom-reject-server]
@@
-58,23
+48,18
@@
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[1-verify-custom-reject-server2]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-
[1-verify-custom-reject-client]
CipherString = DEFAULT
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[1-verify-custom-reject-client]
CipherString = DEFAULT
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-
[test-1]
[test-1]
-ClientAlert = HandshakeFailure
-ClientVerifyCallback = RejectAll
+ExpectedClientAlert = HandshakeFailure
ExpectedResult = ClientFail
ExpectedResult = ClientFail
+client = 1-verify-custom-reject-client-extra
+
+[1-verify-custom-reject-client-extra]
+VerifyCallback = RejectAll
# ===========================================================
# ===========================================================
@@
-84,7
+69,6
@@
ssl_conf = 2-verify-custom-allow-ssl
[2-verify-custom-allow-ssl]
server = 2-verify-custom-allow-server
[2-verify-custom-allow-ssl]
server = 2-verify-custom-allow-server
-server2 = 2-verify-custom-allow-server2
client = 2-verify-custom-allow-client
[2-verify-custom-allow-server]
client = 2-verify-custom-allow-client
[2-verify-custom-allow-server]
@@
-92,22
+76,17
@@
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[2-verify-custom-allow-server2]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-
[2-verify-custom-allow-client]
CipherString = DEFAULT
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[2-verify-custom-allow-client]
CipherString = DEFAULT
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-
[test-2]
[test-2]
-ClientVerifyCallback = AcceptAll
ExpectedResult = Success
ExpectedResult = Success
+client = 2-verify-custom-allow-client-extra
+
+[2-verify-custom-allow-client-extra]
+VerifyCallback = AcceptAll
# ===========================================================
# ===========================================================
@@
-117,7
+96,6
@@
ssl_conf = 3-noverify-success-ssl
[3-noverify-success-ssl]
server = 3-noverify-success-server
[3-noverify-success-ssl]
server = 3-noverify-success-server
-server2 = 3-noverify-success-server2
client = 3-noverify-success-client
[3-noverify-success-server]
client = 3-noverify-success-client
[3-noverify-success-server]
@@
-125,17
+103,9
@@
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[3-noverify-success-server2]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-
[3-noverify-success-client]
CipherString = DEFAULT
[3-noverify-success-client]
CipherString = DEFAULT
-
[test-3]
ExpectedResult = Success
[test-3]
ExpectedResult = Success
@@
-147,7
+117,6
@@
ssl_conf = 4-noverify-ignore-custom-reject-ssl
[4-noverify-ignore-custom-reject-ssl]
server = 4-noverify-ignore-custom-reject-server
[4-noverify-ignore-custom-reject-ssl]
server = 4-noverify-ignore-custom-reject-server
-server2 = 4-noverify-ignore-custom-reject-server2
client = 4-noverify-ignore-custom-reject-client
[4-noverify-ignore-custom-reject-server]
client = 4-noverify-ignore-custom-reject-client
[4-noverify-ignore-custom-reject-server]
@@
-155,20
+124,15
@@
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[4-noverify-ignore-custom-reject-server2]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-
[4-noverify-ignore-custom-reject-client]
CipherString = DEFAULT
[4-noverify-ignore-custom-reject-client]
CipherString = DEFAULT
-
[test-4]
[test-4]
-ClientVerifyCallback = RejectAll
ExpectedResult = Success
ExpectedResult = Success
+client = 4-noverify-ignore-custom-reject-client-extra
+
+[4-noverify-ignore-custom-reject-client-extra]
+VerifyCallback = RejectAll
# ===========================================================
# ===========================================================
@@
-178,7
+142,6
@@
ssl_conf = 5-noverify-accept-custom-allow-ssl
[5-noverify-accept-custom-allow-ssl]
server = 5-noverify-accept-custom-allow-server
[5-noverify-accept-custom-allow-ssl]
server = 5-noverify-accept-custom-allow-server
-server2 = 5-noverify-accept-custom-allow-server2
client = 5-noverify-accept-custom-allow-client
[5-noverify-accept-custom-allow-server]
client = 5-noverify-accept-custom-allow-client
[5-noverify-accept-custom-allow-server]
@@
-186,20
+149,15
@@
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[5-noverify-accept-custom-allow-server2]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-
[5-noverify-accept-custom-allow-client]
CipherString = DEFAULT
[5-noverify-accept-custom-allow-client]
CipherString = DEFAULT
-
[test-5]
[test-5]
-ClientVerifyCallback = AcceptAll
ExpectedResult = Success
ExpectedResult = Success
+client = 5-noverify-accept-custom-allow-client-extra
+
+[5-noverify-accept-custom-allow-client-extra]
+VerifyCallback = AcceptAll
# ===========================================================
# ===========================================================
@@
-209,7
+167,6
@@
ssl_conf = 6-verify-fail-no-root-ssl
[6-verify-fail-no-root-ssl]
server = 6-verify-fail-no-root-server
[6-verify-fail-no-root-ssl]
server = 6-verify-fail-no-root-server
-server2 = 6-verify-fail-no-root-server2
client = 6-verify-fail-no-root-client
[6-verify-fail-no-root-server]
client = 6-verify-fail-no-root-client
[6-verify-fail-no-root-server]
@@
-217,20
+174,12
@@
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[6-verify-fail-no-root-server2]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-
[6-verify-fail-no-root-client]
CipherString = DEFAULT
VerifyMode = Peer
[6-verify-fail-no-root-client]
CipherString = DEFAULT
VerifyMode = Peer
-
[test-6]
[test-6]
-ClientAlert = UnknownCA
+
Expected
ClientAlert = UnknownCA
ExpectedResult = ClientFail
ExpectedResult = ClientFail
@@
-241,7
+190,6
@@
ssl_conf = 7-verify-custom-success-no-root-ssl
[7-verify-custom-success-no-root-ssl]
server = 7-verify-custom-success-no-root-server
[7-verify-custom-success-no-root-ssl]
server = 7-verify-custom-success-no-root-server
-server2 = 7-verify-custom-success-no-root-server2
client = 7-verify-custom-success-no-root-client
[7-verify-custom-success-no-root-server]
client = 7-verify-custom-success-no-root-client
[7-verify-custom-success-no-root-server]
@@
-249,21
+197,16
@@
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[7-verify-custom-success-no-root-server2]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-
[7-verify-custom-success-no-root-client]
CipherString = DEFAULT
VerifyMode = Peer
[7-verify-custom-success-no-root-client]
CipherString = DEFAULT
VerifyMode = Peer
-
[test-7]
[test-7]
-ClientVerifyCallback = AcceptAll
ExpectedResult = Success
ExpectedResult = Success
+client = 7-verify-custom-success-no-root-client-extra
+
+[7-verify-custom-success-no-root-client-extra]
+VerifyCallback = AcceptAll
# ===========================================================
# ===========================================================
@@
-273,7
+216,6
@@
ssl_conf = 8-verify-custom-fail-no-root-ssl
[8-verify-custom-fail-no-root-ssl]
server = 8-verify-custom-fail-no-root-server
[8-verify-custom-fail-no-root-ssl]
server = 8-verify-custom-fail-no-root-server
-server2 = 8-verify-custom-fail-no-root-server2
client = 8-verify-custom-fail-no-root-client
[8-verify-custom-fail-no-root-server]
client = 8-verify-custom-fail-no-root-client
[8-verify-custom-fail-no-root-server]
@@
-281,21
+223,16
@@
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
CipherString = DEFAULT
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[8-verify-custom-fail-no-root-server2]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-
[8-verify-custom-fail-no-root-client]
CipherString = DEFAULT
VerifyMode = Peer
[8-verify-custom-fail-no-root-client]
CipherString = DEFAULT
VerifyMode = Peer
-
[test-8]
[test-8]
-ClientAlert = HandshakeFailure
-ClientVerifyCallback = RejectAll
+ExpectedClientAlert = HandshakeFailure
ExpectedResult = ClientFail
ExpectedResult = ClientFail
+client = 8-verify-custom-fail-no-root-client-extra
+
+[8-verify-custom-fail-no-root-client-extra]
+VerifyCallback = RejectAll