diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-11-18 15:38:29 +0100 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2016-11-18 15:38:29 +0100 |
| commit | 1ac32b94c7a09f4eea474a370d469a9224cfad4f (patch) | |
| tree | 946c85e836c83902f0e787560cb004a8dbe0bc57 | |
| parent | d1b81c5cdf944096e47d01ec92c90d65d0c5aac7 (diff) | |
| download | nss-hg-1ac32b94c7a09f4eea474a370d469a9224cfad4f.tar.gz | |
Bug 1177763 - don't build intel gcm when using msan, r=ttaubert
| -rw-r--r-- | cmd/selfserv/selfserv.c | 2 | ||||
| -rw-r--r-- | lib/freebl/freebl.gyp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cmd/selfserv/selfserv.c b/cmd/selfserv/selfserv.c index 930b5779a..f34af7d74 100644 --- a/cmd/selfserv/selfserv.c +++ b/cmd/selfserv/selfserv.c @@ -1256,7 +1256,7 @@ handle_connection( PRSocketOptionData opt; PRIOVec iovs[16]; char msgBuf[160]; - char buf[10240]; + char buf[10240] = { 0 }; char fileName[513]; char proto[128]; PRDescIdentity aboveLayer = PR_INVALID_IO_LAYER; diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp index a830f21a9..f5ae232ec 100644 --- a/lib/freebl/freebl.gyp +++ b/lib/freebl/freebl.gyp @@ -373,6 +373,10 @@ 'MPI_AMD64', 'MP_ASSEMBLY_MULTIPLY', 'NSS_USE_COMBA', + ], + }], + [ 'target_arch=="x64" and use_msan==0', { + 'defines': [ 'USE_HW_AES', 'INTEL_GCM', ], |