diff options
| author | EKR <ekr@rtfm.com> | 2016-02-06 11:11:29 -0800 |
|---|---|---|
| committer | EKR <ekr@rtfm.com> | 2016-02-06 11:11:29 -0800 |
| commit | edc3db77f53be77bd944fd5fddcbc478850a7a52 (patch) | |
| tree | bafa75237091d42d0e03a6133d02d750d9397f83 /lib/ssl | |
| parent | 0f104d473f131c4e104feaba45bb40c1d442be58 (diff) | |
| download | nss-hg-edc3db77f53be77bd944fd5fddcbc478850a7a52.tar.gz | |
Bug 1243872. Rename NSS_ENABLE_SSL_ZLIB to NSS_SSL_ENABLE_ZLIB. r=wtc
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/config.mk | 4 | ||||
| -rw-r--r-- | lib/ssl/ssl3con.c | 14 | ||||
| -rw-r--r-- | lib/ssl/sslimpl.h | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lib/ssl/config.mk b/lib/ssl/config.mk index 89fc52838..eda33da89 100644 --- a/lib/ssl/config.mk +++ b/lib/ssl/config.mk @@ -67,8 +67,8 @@ endif endif -ifdef NSS_ENABLE_SSL_ZLIB -DEFINES += -DNSS_ENABLE_SSL_ZLIB +ifdef NSS_SSL_ENABLE_ZLIB +DEFINES += -DNSS_SSL_ENABLE_ZLIB include $(CORE_DEPTH)/coreconf/zlib.mk endif diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c index 8afdf9dd6..cfed4de70 100644 --- a/lib/ssl/ssl3con.c +++ b/lib/ssl/ssl3con.c @@ -34,7 +34,7 @@ #endif #include <stdio.h> -#ifdef NSS_ENABLE_SSL_ZLIB +#ifdef NSS_SSL_ENABLE_ZLIB #include "zlib.h" #endif @@ -218,7 +218,7 @@ void ssl3_CheckCipherSuiteOrderConsistency() * implement. */ static const /*SSLCompressionMethod*/ PRUint8 compressions [] = { -#ifdef NSS_ENABLE_SSL_ZLIB +#ifdef NSS_SSL_ENABLE_ZLIB ssl_compression_deflate, #endif ssl_compression_null @@ -235,7 +235,7 @@ compressionEnabled(sslSocket *ss, SSLCompressionMethod compression) switch (compression) { case ssl_compression_null: return PR_TRUE; /* Always enabled */ -#ifdef NSS_ENABLE_SSL_ZLIB +#ifdef NSS_SSL_ENABLE_ZLIB case ssl_compression_deflate: if (ss->version < SSL_LIBRARY_VERSION_TLS_1_3) { return ss->opt.enableDeflate; @@ -1503,7 +1503,7 @@ ssl3_SetupPendingCipherSpec(sslSocket *ss) return SECSuccess; } -#ifdef NSS_ENABLE_SSL_ZLIB +#ifdef NSS_SSL_ENABLE_ZLIB #define SSL3_DEFLATE_CONTEXT_SIZE sizeof(z_stream) static SECStatus @@ -1610,7 +1610,7 @@ ssl3_DestroyDecompressContext(void *void_context, PRBool unused) return SECSuccess; } -#endif /* NSS_ENABLE_SSL_ZLIB */ +#endif /* NSS_SSL_ENABLE_ZLIB */ /* Initialize the compression functions and contexts for the given * CipherSpec. */ @@ -1627,7 +1627,7 @@ ssl3_InitCompressionContext(ssl3CipherSpec *pwSpec) pwSpec->destroyCompressContext = NULL; pwSpec->destroyDecompressContext = NULL; break; -#ifdef NSS_ENABLE_SSL_ZLIB +#ifdef NSS_SSL_ENABLE_ZLIB case ssl_compression_deflate: pwSpec->compressor = ssl3_DeflateCompress; pwSpec->decompressor = ssl3_DeflateDecompress; @@ -1638,7 +1638,7 @@ ssl3_InitCompressionContext(ssl3CipherSpec *pwSpec) ssl3_DeflateInit(pwSpec->compressContext); ssl3_InflateInit(pwSpec->decompressContext); break; -#endif /* NSS_ENABLE_SSL_ZLIB */ +#endif /* NSS_SSL_ENABLE_ZLIB */ default: PORT_Assert(0); PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); diff --git a/lib/ssl/sslimpl.h b/lib/ssl/sslimpl.h index 6233d7678..a7ebc9aa6 100644 --- a/lib/ssl/sslimpl.h +++ b/lib/ssl/sslimpl.h @@ -1538,13 +1538,13 @@ extern PRInt32 ssl3_SendRecord(sslSocket *ss, DTLSEpoch epoch, const SSL3Opaque* pIn, PRInt32 nIn, PRInt32 flags); -#ifdef NSS_ENABLE_SSL_ZLIB +#ifdef NSS_SSL_ENABLE_ZLIB /* * The DEFLATE algorithm can result in an expansion of 0.1% + 12 bytes. For a * maximum TLS record payload of 2**14 bytes, that's 29 bytes. */ #define SSL3_COMPRESSION_MAX_EXPANSION 29 -#else /* !NSS_ENABLE_SSL_ZLIB */ +#else /* !NSS_SSL_ENABLE_ZLIB */ #define SSL3_COMPRESSION_MAX_EXPANSION 0 #endif |