diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-12-24 19:36:38 +0100 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-12-24 19:36:38 +0100 |
| commit | 8974a6681c430357632f5da4cc98f88ac46fe9e9 (patch) | |
| tree | 4eac6f15496bf7609df6cc26b6703a051c3097aa /src/core/tsi/ssl_transport_security.c | |
| parent | 7052ac25e60e137514d9a201a86eeb9b29b03d24 (diff) | |
| parent | 7593cff337629ca179302ddf6ce2cbedbbbcab73 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'src/core/tsi/ssl_transport_security.c')
| -rw-r--r-- | src/core/tsi/ssl_transport_security.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/tsi/ssl_transport_security.c b/src/core/tsi/ssl_transport_security.c index 22b57964cc..a72cbf6e47 100644 --- a/src/core/tsi/ssl_transport_security.c +++ b/src/core/tsi/ssl_transport_security.c @@ -40,7 +40,6 @@ #include <grpc/support/sync.h> #include <grpc/support/thd.h> #include <grpc/support/useful.h> -#include "src/core/tsi/transport_security.h" #include <openssl/bio.h> #include <openssl/crypto.h> /* For OPENSSL_free */ @@ -49,6 +48,9 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> +#include "src/core/tsi/ssl_types.h" +#include "src/core/tsi/transport_security.h" + /* --- Constants. ---*/ #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND 16384 @@ -291,7 +293,7 @@ static tsi_result add_subject_alt_names_properties_to_peer( for (i = 0; i < subject_alt_name_count; i++) { GENERAL_NAME *subject_alt_name = - sk_GENERAL_NAME_value(subject_alt_names, (int)i); + sk_GENERAL_NAME_value(subject_alt_names, TSI_SIZE_AS_SIZE(i)); /* Filter out the non-dns entries names. */ if (subject_alt_name->type == GEN_DNS) { unsigned char *dns_name = NULL; |