diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-15 01:42:53 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-15 01:42:53 +0100 |
| commit | 74cabf7948b2597f5b6a67d6910c844fd1a88ff6 (patch) | |
| tree | db1f30ada487c3831ea8e4e98b2d39edc9e88eea /security/nss/fuzz | |
| parent | 09ef48bd005a7f9e97a3fe797a079fcf2b5e58d3 (diff) | |
| download | UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.gz UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.lz UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.xz UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.zip | |
Update NSS to 3.41
Diffstat (limited to 'security/nss/fuzz')
| -rw-r--r-- | security/nss/fuzz/config/git-copy.sh | 6 | ||||
| -rw-r--r-- | security/nss/fuzz/tls_server_certs.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/fuzz/config/git-copy.sh b/security/nss/fuzz/config/git-copy.sh index a9e817e2a..fac8cbecf 100644 --- a/security/nss/fuzz/config/git-copy.sh +++ b/security/nss/fuzz/config/git-copy.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -e +set -ex if [ $# -lt 3 ]; then echo "Usage: $0 <repo> <branch> <directory>" 1>&2 @@ -28,7 +28,7 @@ fi rm -rf "$DIR" git init -q "$DIR" -git -C "$DIR" fetch -q --depth=1 "$REPO" "$COMMIT":git-copy-tmp -git -C "$DIR" reset --hard git-copy-tmp +git -C "$DIR" fetch -q --depth=1 "$REPO" "$COMMIT" +git -C "$DIR" reset -q --hard FETCH_HEAD git -C "$DIR" rev-parse --verify HEAD > "$DIR"/.git-copy rm -rf "$DIR"/.git diff --git a/security/nss/fuzz/tls_server_certs.cc b/security/nss/fuzz/tls_server_certs.cc index 705b6aab3..20732a5e0 100644 --- a/security/nss/fuzz/tls_server_certs.cc +++ b/security/nss/fuzz/tls_server_certs.cc @@ -8,7 +8,7 @@ #include "ssl.h" #include "cpputil.h" -#include "scoped_ptrs.h" +#include "nss_scoped_ptrs.h" #include "tls_server_certs.h" const uint8_t kP256ServerCert[] = { |