From e48131bfbe4b3b1e7b5e2ff4575ed6be0316d86e Mon Sep 17 00:00:00 2001
From: Lucio Franco <luciofranco14@gmail.com>
Date: Tue, 3 Sep 2019 10:17:17 -0400
Subject: [PATCH] Add alpn to server tls and fix interop test script

---
 tonic-interop/test.sh              | 6 +++++-
 tonic/src/transport/tls/openssl.rs | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tonic-interop/test.sh b/tonic-interop/test.sh
index 724df66..2766689 100755
--- a/tonic-interop/test.sh
+++ b/tonic-interop/test.sh
@@ -12,8 +12,12 @@ esac
 ARG="${1:-""}"
 SERVER="tonic-interop/bin/server_${OS}_amd64"
 
+# TLS_CA="tonic-interop/data/ca.pem"
+TLS_CRT="tonic-interop/data/server1.pem"
+TLS_KEY="tonic-interop/data/server1.key"
+
 # run the test server
-./"${SERVER}" $ARG &
+./"${SERVER}" $ARG --tls_cert_file $TLS_CRT --tls_key_file $TLS_KEY &
 SERVER_PID=$!
 echo ":; started grpc-go test server."
 
diff --git a/tonic/src/transport/tls/openssl.rs b/tonic/src/transport/tls/openssl.rs
index a8d9e8c..e34c799 100644
--- a/tonic/src/transport/tls/openssl.rs
+++ b/tonic/src/transport/tls/openssl.rs
@@ -55,6 +55,7 @@ impl TlsAcceptor {
 
         let mut config = SslAcceptor::mozilla_modern(SslMethod::tls())?;
 
+        config.set_alpn_protos(ALPN_H2)?;
         config.set_private_key(&key)?;
         config.set_certificate(&ca)?;