diff --git a/gnutls/Interoperability/renegotiation-with-OpenSSL/Makefile b/gnutls/Interoperability/renegotiation-with-OpenSSL/Makefile
index 46b73d3..e600c26 100644
--- a/gnutls/Interoperability/renegotiation-with-OpenSSL/Makefile
+++ b/gnutls/Interoperability/renegotiation-with-OpenSSL/Makefile
@@ -59,5 +59,5 @@ $(METADATA): Makefile
 	@echo "License:         GPLv2" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
 	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5 -RHEL6" >> $(METADATA)
 
diff --git a/gnutls/Interoperability/renegotiation-with-OpenSSL/runtest.sh b/gnutls/Interoperability/renegotiation-with-OpenSSL/runtest.sh
index 3aa0b65..cf37c9b 100755
--- a/gnutls/Interoperability/renegotiation-with-OpenSSL/runtest.sh
+++ b/gnutls/Interoperability/renegotiation-with-OpenSSL/runtest.sh
@@ -31,40 +31,415 @@
 
 PACKAGE="gnutls"
 PACKAGES="gnutls openssl"
+GNUTLS_PRIO="NORMAL:+DHE-DSS:+SIGN-DSA-SHA1:+SIGN-DSA-SHA224:+SIGN-DSA-SHA256"
 
 rlJournalStart
     rlPhaseStartSetup
         rlAssertRpm --all
+        rlRun "rlImport openssl/certgen"
         rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
         rlRun "pushd $TmpDir"
-        rlRun "openssl req -x509 -newkey rsa -keyout localhost.key -out localhost.crt -nodes -batch -subj /CN=localhost"
-    rlPhaseEnd
+        rlRun "x509KeyGen ca"
+        rlRun "x509KeyGen rsa-ca"
+        rlRun "x509KeyGen -t dsa dsa-ca"
+        rlRun "x509KeyGen -t ecdsa ecdsa-ca"
+        rlRun "x509KeyGen rsa-server"
+        rlRun "x509KeyGen -t dsa dsa-server"
+        rlRun "x509KeyGen -t dsa -s 1024 dsa-server-1024"
+        rlRun "x509KeyGen -t ecdsa ecdsa-server"
+        rlRun "x509KeyGen rsa-client"
+        rlRun "x509KeyGen -t dsa dsa-client"
+        rlRun "x509KeyGen -t dsa -s 1024 dsa-client-1024"
+        rlRun "x509KeyGen -t ecdsa ecdsa-client"
+        rlRun "x509SelfSign ca"
+        rlRun "x509CertSign --CA ca -t ca --DN 'CN=RSA CA' rsa-ca"
+        rlRun "x509CertSign --CA ca -t ca --DN 'CN=DSA CA' dsa-ca"
+        rlRun "x509CertSign --CA ca -t ca --DN 'CN=ECDSA CA' ecdsa-ca"
+        rlRun "x509CertSign --CA rsa-ca rsa-server"
+        rlRun "x509CertSign --CA dsa-ca dsa-server"
+        rlRun "x509CertSign --CA dsa-ca dsa-server-1024"
+        rlRun "x509CertSign --CA ecdsa-ca ecdsa-server"
+        rlRun "x509CertSign --CA rsa-ca -t webclient rsa-client"
+        rlRun "x509CertSign --CA dsa-ca -t webclient dsa-client"
+        rlRun "x509CertSign --CA dsa-ca -t webclient dsa-client-1024"
+        rlRun "x509CertSign --CA ecdsa-ca -t webclient ecdsa-client"
+        rlRun "x509DumpCert ca" 0 "Root CA"
+        rlRun "x509DumpCert rsa-ca" 0 "Intermediate RSA CA"
+        rlRun "x509DumpCert dsa-ca" 0 "Intermediate DSA CA"
+        rlRun "x509DumpCert ecdsa-ca" 0 "Intermediate ECDSA CA"
+        rlRun "x509DumpCert rsa-server" 0 "Server RSA certificate"
+        rlRun "x509DumpCert dsa-server" 0 "Server DSA certificate"
+        rlRun "x509DumpCert dsa-server-1024" 0 "Server DSA certificate (1024-bit)"
+        rlRun "x509DumpCert ecdsa-server" 0 "Server ECDSA certificate"
+        rlRun "x509DumpCert rsa-client" 0 "Client RSA certificate"
+        rlRun "x509DumpCert dsa-client" 0 "Client DSA certificate"
+        rlRun "x509DumpCert dsa-client-1024" 0 "Client DSA certificate (1024-bit)"
+        rlRun "x509DumpCert ecdsa-client" 0 "Client ECDSA certificate"
+
+        # Tested combinations
+
+        # Structure definiton:
+        # C_NAME          IETF name of a ciphersuite
+        # C_OPENSSL       OpenSSL ciphersuite ID
+        # C_GNUTLS        GNUTLS ciphersuite ID (unused for now)
+        # C_TLS1_2_ONLY   new ciphersuite in TLS1.2
+        # C_SUBCA         intermediate CA
+        # C_CERT          EE (end-entity) certificate
+        # C_KEY           EE key
+        # C_CLNT_CERT     client certificate
+        # C_CLNT_KEY      client key
+        i=0
+
+        C_NAME[$i]="TLS_RSA_WITH_AES_128_CBC_SHA"
+        C_OPENSSL[$i]="AES128-SHA"
+        C_GNUTLS[$i]="TLS_RSA_AES_128_CBC_SHA1"
+        C_TLS1_2_ONLY[$i]="False"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_RSA_WITH_AES_256_CBC_SHA256"
+        C_OPENSSL[$i]="AES256-SHA256"
+        C_GNUTLS[$i]="TLS_RSA_AES_256_CBC_SHA256"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_RSA_WITH_AES_128_GCM_SHA256"
+        C_OPENSSL[$i]="AES128-GCM-SHA256"
+        C_GNUTLS[$i]="TLS_RSA_AES_128_GCM_SHA256"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_RSA_WITH_AES_256_GCM_SHA384"
+        C_OPENSSL[$i]="AES256-GCM-SHA384"
+        C_GNUTLS[$i]="TLS_RSA_AES_256_GCM_SHA384"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
+        C_OPENSSL[$i]="DHE-RSA-AES128-SHA"
+        C_GNUTLS[$i]="TLS_DHE_RSA_AES_128_CBC_SHA1"
+        C_TLS1_2_ONLY[$i]="False"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"
+        C_OPENSSL[$i]="DHE-RSA-AES256-SHA256"
+        C_GNUTLS[$i]="TLS_DHE_RSA_AES_256_CBC_SHA256"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
+        C_OPENSSL[$i]="DHE-RSA-AES128-GCM-SHA256"
+        C_GNUTLS[$i]="TLS_DHE_RSA_AES_128_GCM_SHA256"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"
+        C_OPENSSL[$i]="DHE-RSA-AES256-GCM-SHA384"
+        C_GNUTLS[$i]="TLS_DHE_RSA_AES_256_GCM_SHA384"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_DHE_DSS_WITH_AES_128_CBC_SHA"
+        C_OPENSSL[$i]="DHE-DSS-AES128-SHA"
+        C_GNUTLS[$i]="TLS_DHE_DSS_AES_128_CBC_SHA1"
+        C_TLS1_2_ONLY[$i]="False"
+        C_SUBCA[$i]="$(x509Cert dsa-ca)"
+        C_CERT[$i]="$(x509Cert dsa-server-1024)"
+        C_KEY[$i]="$(x509Key dsa-server-1024)"
+        C_CLNT_CERT[$i]="$(x509Cert dsa-client-1024)"
+        C_CLNT_KEY[$i]="$(x509Key dsa-client-1024)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"
+        C_OPENSSL[$i]="DHE-DSS-AES256-SHA256"
+        C_GNUTLS[$i]="TLS_DHE_DSS_AES_256_CBC_SHA256"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert dsa-ca)"
+        C_CERT[$i]="$(x509Cert dsa-server)"
+        C_KEY[$i]="$(x509Key dsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert dsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key dsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_DHE_DSS_WITH_AES_128_GCM_SHA256"
+        C_OPENSSL[$i]="DHE-DSS-AES128-GCM-SHA256"
+        C_GNUTLS[$i]="TLS_DHE_DSS_AES_128_GCM_SHA256"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert dsa-ca)"
+        C_CERT[$i]="$(x509Cert dsa-server)"
+        C_KEY[$i]="$(x509Key dsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert dsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key dsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_DHE_DSS_WITH_AES_256_GCM_SHA384"
+        C_OPENSSL[$i]="DHE-DSS-AES256-GCM-SHA384"
+        C_GNUTLS[$i]="TLS_DHE_DSS_AES_256_GCM_SHA384"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert dsa-ca)"
+        C_CERT[$i]="$(x509Cert dsa-server)"
+        C_KEY[$i]="$(x509Key dsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert dsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key dsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"
+        C_OPENSSL[$i]="ECDHE-RSA-DES-CBC3-SHA"
+        C_GNUTLS[$i]="TLS_ECDHE_RSA_3DES_EDE_CBC_SHA1"
+        C_TLS1_2_ONLY[$i]="False"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
+        C_OPENSSL[$i]="ECDHE-RSA-AES256-SHA384"
+        C_GNUTLS[$i]="TLS_ECDHE_RSA_AES_256_CBC_SHA384"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
+        C_OPENSSL[$i]="ECDHE-RSA-AES128-GCM-SHA256"
+        C_GNUTLS[$i]="TLS_ECDHE_RSA_AES_128_GCM_SHA256"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
+        C_OPENSSL[$i]="ECDHE-RSA-AES256-GCM-SHA384"
+        C_GNUTLS[$i]="TLS_ECDHE_RSA_AES_256_GCM_SHA384"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert rsa-ca)"
+        C_CERT[$i]="$(x509Cert rsa-server)"
+        C_KEY[$i]="$(x509Key rsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert rsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key rsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
+        C_OPENSSL[$i]="ECDHE-ECDSA-AES256-SHA"
+        C_GNUTLS[$i]="TLS_ECDHE_ECDSA_AES_256_CBC_SHA1"
+        C_TLS1_2_ONLY[$i]="False"
+        C_SUBCA[$i]="$(x509Cert ecdsa-ca)"
+        C_CERT[$i]="$(x509Cert ecdsa-server)"
+        C_KEY[$i]="$(x509Key ecdsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert ecdsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key ecdsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"
+        C_OPENSSL[$i]="ECDHE-ECDSA-AES128-SHA256"
+        C_GNUTLS[$i]="TLS_ECDHE_ECDSA_AES_128_CBC_SHA256"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert ecdsa-ca)"
+        C_CERT[$i]="$(x509Cert ecdsa-server)"
+        C_KEY[$i]="$(x509Key ecdsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert ecdsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key ecdsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
+        C_OPENSSL[$i]="ECDHE-ECDSA-AES128-GCM-SHA256"
+        C_GNUTLS[$i]="TLS_ECDHE_ECDSA_AES_128_GCM_SHA256"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert ecdsa-ca)"
+        C_CERT[$i]="$(x509Cert ecdsa-server)"
+        C_KEY[$i]="$(x509Key ecdsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert ecdsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key ecdsa-client)"
+        i=$(($i+1))
+
+        C_NAME[$i]="TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
+        C_OPENSSL[$i]="ECDHE-ECDSA-AES256-GCM-SHA384"
+        C_GNUTLS[$i]="TLS_ECDHE_ECDSA_AES_256_GCM_SHA384"
+        C_TLS1_2_ONLY[$i]="True"
+        C_SUBCA[$i]="$(x509Cert ecdsa-ca)"
+        C_CERT[$i]="$(x509Cert ecdsa-server)"
+        C_KEY[$i]="$(x509Key ecdsa-server)"
+        C_CLNT_CERT[$i]="$(x509Cert ecdsa-client)"
+        C_CLNT_KEY[$i]="$(x509Key ecdsa-client)"
+        i=$(($i+1))
 
-    rlPhaseStartTest "openssl server"
-        rlRun "openssl s_server -www -key localhost.key -cert localhost.crt >server.log 2>server.err &"
-        openssl_pid=$!
-        rlRun "rlWaitForSocket -p $openssl_pid 4433"
-        for sett in NORMAL "NORMAL:+VERS-TLS1.2" "NORMAL:-VERS-TLS1.2"; do
-            rlRun -s "gnutls-cli --priority '$sett' --rehandshake --x509cafile localhost.crt --port 4433 localhost </dev/null"
-            rlAssertGrep "ReHandshake was completed" $rlRun_LOG
-            rlAssertNotGrep "failure" $rlRun_LOG -i
-        done
-        rlRun "kill $openssl_pid" 0,1
-        rlRun "rlWait $openssl_pid" 143
     rlPhaseEnd
 
-    rlPhaseStartTest "gnutls server"
-        rlRun "gnutls-serv --priority NORMAL:+VERS-TLS1.2 --x509keyfile localhost.key --x509certfile localhost.crt --http --port 4433 >server.log 2>server.err &"
-        gnutls_pid=$!
-        rlRun "rlWaitForSocket -p $gnutls_pid 4433"
-        for sett in "" "-tls1_1" "-tls1_2"; do
-            rlRun -s "(sleep 0.5; echo R; sleep 0.5; echo Q) | openssl s_client -connect localhost:4433 -CAfile localhost.crt $sett"
-            rlAssertGrep "RENEGOTIATING" $rlRun_LOG
-            rlRun "grep -A 10 RENEGOTIATING $rlRun_LOG | grep 'verify return:1'"
+    for idx in ${!C_NAME[@]}; do
+        for proto in tls1_2 tls1_1; do
+
+            # skip tests of TLSv1.2 specific ciphers when testing TLSv1.1
+            if [[ $proto == "tls1_1" ]] && [[ ${C_TLS1_2_ONLY[$idx]} == "True" ]]; then
+                continue
+            fi
+
+            rlPhaseStartTest "OpenSSL <-> GNUTLS [${C_NAME[$idx]}, $proto]"
+                # OpenSSL server setup
+                options=(openssl s_server -www -key ${C_KEY[$idx]})
+                options+=(-cert ${C_CERT[$idx]})
+                options+=(-CAfile '<(cat $(x509Cert ca) ${C_SUBCA[$idx]})')
+                options+=(-cipher ${C_OPENSSL[$idx]})
+                rlRun "${options[*]} >server.log 2>server.err &"
+                openssl_pid=$!
+                rlRun "rlWaitForSocket -p $openssl_pid 4433"
+
+                # GNUTLS client setup
+                options=(gnutls-cli --rehandshake --x509cafile $(x509Cert ca))
+                options+=(--port 4433)
+                if [[ $proto == "tls1_1" ]]; then
+                    options+=(--priority ${GNUTLS_PRIO}:-VERS-TLS1.2)
+                else
+                    options+=(--priority ${GNUTLS_PRIO}:+VERS-TLS1.2)
+                fi
+                rlRun -s "${options[*]} localhost </dev/null"
+                rlAssertGrep "ReHandshake was completed" $rlRun_LOG
+                rlAssertNotGrep "failure" $rlRun_LOG -i
+                rlRun "kill $openssl_pid" 0,1
+                rlRun "rlWait $openssl_pid" 143
+                if ! rlGetPhaseState; then
+                    rlRun "cat server.log"
+                    rlRun "cat server.err"
+                fi
+            rlPhaseEnd
+
+            rlPhaseStartTest "OpenSSL <-> GNUTLS [${C_NAME[$idx]}, $proto, client auth]"
+                # OpenSSL server setup
+                options=(openssl s_server -www -key ${C_KEY[$idx]})
+                options+=(-cert ${C_CERT[$idx]})
+                options+=(-CAfile '<(cat $(x509Cert ca) ${C_SUBCA[$idx]})')
+                options+=(-cipher ${C_OPENSSL[$idx]})
+                options+=(-Verify 1 -verify_return_error)
+                rlRun "${options[*]} >server.log 2>server.err &"
+                openssl_pid=$!
+                rlRun "rlWaitForSocket -p $openssl_pid 4433"
+
+                # GNUTLS client setup
+                options=(gnutls-cli --rehandshake)
+                options+=(--x509cafile '<(cat $(x509Cert ca) ${C_SUBCA[$idx]})')
+                options+=(--x509keyfile ${C_CLNT_KEY[$idx]})
+                options+=(--x509certfile ${C_CLNT_CERT[$idx]})
+                options+=(--port 4433)
+                if [[ $proto == "tls1_1" ]]; then
+                    options+=(--priority ${GNUTLS_PRIO}:-VERS-TLS1.2)
+                else
+                    options+=(--priority ${GNUTLS_PRIO}:+VERS-TLS1.2)
+                fi
+                rlRun -s "${options[*]} localhost </dev/null"
+                rlAssertGrep "ReHandshake was completed" $rlRun_LOG
+                rlAssertNotGrep "failure" $rlRun_LOG -i
+                rlRun "kill $openssl_pid" 0,1
+                rlRun "rlWait $openssl_pid" 143
+                if ! rlGetPhaseState; then
+                    rlRun "cat server.log"
+                    rlRun "cat server.err"
+                fi
+            rlPhaseEnd
+
+            rlPhaseStartTest "GNUTLS <-> OpenSSL [${C_NAME[$idx]}, $proto]"
+                # GNUTLS server setup
+                options=(gnutls-serv --x509keyfile ${C_KEY[$idx]})
+                options+=(--x509certfile '<(cat ${C_CERT[$idx]} ${C_SUBCA[$idx]})')
+                options+=(--http --port 4433 --priority ${GNUTLS_PRIO}:+VERS-TLS1.2)
+                rlRun "${options[*]} >server.log 2>server.err &"
+                gnutls_pid=$!
+                rlRun "rlWaitForSocket -p $gnutls_pid 4433"
+
+                # OpenSSL client setup
+                options=(openssl s_client -connect localhost:4433)
+                options+=(-CAfile $(x509Cert ca))
+                options+=(-cipher ${C_OPENSSL[$idx]})
+                if [[ $proto == "tls1_1" ]]; then
+                    options+=(-tls1_1)
+                fi
+                rlRun -s "(sleep 0.5; echo R; sleep 0.5; echo Q) | ${options[*]}"
+                rlAssertGrep "RENEGOTIATING" $rlRun_LOG
+                rlRun "grep -A 10 RENEGOTIATING $rlRun_LOG | grep 'verify return:1'"
+                rlRun "kill $gnutls_pid" 0,1
+                rlRun "rlWait $gnutls_pid" 1,143
+                if ! rlGetPhaseState; then
+                    rlRun "cat server.log"
+                    rlRun "cat server.err"
+                fi
+            rlPhaseEnd
+
+            rlPhaseStartTest "GNUTLS <-> OpenSSL [${C_NAME[$idx]}, $proto, client auth]"
+                # GNUTLS server setup
+                options=(gnutls-serv --x509keyfile ${C_KEY[$idx]})
+                options+=(--x509cafile '<(cat $(x509Cert ca) ${C_SUBCA[$idx]})')
+                options+=(--x509certfile '<(cat ${C_CERT[$idx]} ${C_SUBCA[$idx]})')
+                options+=(--http --port 4433 --priority ${GNUTLS_PRIO}:+VERS-TLS1.2)
+                options+=(--require-client-cert --verify-client-cert)
+                rlRun "${options[*]} >server.log 2>server.err &"
+                gnutls_pid=$!
+                rlRun "rlWaitForSocket -p $gnutls_pid 4433"
+
+                # OpenSSL client setup
+                options=(openssl s_client -connect localhost:4433)
+                options+=(-CAfile $(x509Cert ca))
+                options+=(-cert ${C_CLNT_CERT[$idx]} -key ${C_CLNT_KEY[$idx]})
+                options+=(-cipher ${C_OPENSSL[$idx]})
+                if [[ $proto == "tls1_1" ]]; then
+                    options+=(-tls1_1)
+                fi
+                rlRun -s "(sleep 0.5; echo R; sleep 0.5; echo Q) | ${options[*]}"
+                rlAssertGrep "RENEGOTIATING" $rlRun_LOG
+                rlRun "grep -A 10 RENEGOTIATING $rlRun_LOG | grep 'verify return:1'"
+                rlRun "kill $gnutls_pid" 0,1
+                rlRun "rlWait $gnutls_pid" 1,143
+                if ! rlGetPhaseState; then
+                    rlRun "cat server.log"
+                    rlRun "cat server.err"
+                fi
+            rlPhaseEnd
         done
-        rlRun "kill $gnutls_pid" 0,1
-        rlRun "rlWait $gnutls_pid" 1,143
-    rlPhaseEnd
+    done
 
     rlPhaseStartCleanup
         rlRun "popd"