diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2017-08-09 17:29:12 +1000 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2017-08-09 17:29:12 +1000 |
| commit | 4f161a318bf27027c032591ac40e3c97edc39d62 (patch) | |
| tree | f1cc734642cd1213d453e17a621b416eb24aced0 /cpputil | |
| parent | 45c36ff2f1f88bcabf14b735337cbd7c63dfa54a (diff) | |
| parent | 946fde61f883c3ab583a667069ca6da1d7880084 (diff) | |
| download | nss-hg-4f161a318bf27027c032591ac40e3c97edc39d62.tar.gz | |
Merge NSS trunk to NSS_TLS13_DRAFT19_BRANCH
Diffstat (limited to 'cpputil')
| -rw-r--r-- | cpputil/manifest.mn | 5 | ||||
| -rw-r--r-- | cpputil/tls_parser.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/cpputil/manifest.mn b/cpputil/manifest.mn index ad2d31b45..c515b8c2c 100644 --- a/cpputil/manifest.mn +++ b/cpputil/manifest.mn @@ -8,11 +8,16 @@ DEPTH = .. MODULE = nss LIBRARY_NAME = cpputil +ifeq ($(NSS_BUILD_UTIL_ONLY),1) +CPPSRCS = \ + $(NULL) +else CPPSRCS = \ dummy_io.cc \ dummy_io_fwd.cc \ tls_parser.cc \ $(NULL) +endif EXPORTS = \ $(NULL) diff --git a/cpputil/tls_parser.h b/cpputil/tls_parser.h index 9be4662fd..55bda879d 100644 --- a/cpputil/tls_parser.h +++ b/cpputil/tls_parser.h @@ -24,6 +24,7 @@ const uint8_t kTlsChangeCipherSpecType = 20; const uint8_t kTlsAlertType = 21; const uint8_t kTlsHandshakeType = 22; const uint8_t kTlsApplicationDataType = 23; +const uint8_t kTlsAltHandshakeType = 24; const uint8_t kTlsHandshakeClientHello = 1; const uint8_t kTlsHandshakeServerHello = 2; |