From 9418a297c604a84a1043f10e97163836320959c3 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Mon, 27 Feb 2023 17:33:04 -0800 Subject: Sigh, even when I explicitly push to nss-try, it's pushing to nss! --- .hgignore | 1 - automation/clang-format/run_clang_format.sh | 1 - automation/taskcluster/scripts/split.sh | 2 -- build.sh | 1 - coreconf/config.gypi | 1 - exports.gyp | 1 - help.txt | 4 +--- lib/Makefile | 6 +----- nss.gyp | 1 - 9 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.hgignore b/.hgignore index b9785ff21..feef65007 100644 --- a/.hgignore +++ b/.hgignore @@ -19,4 +19,3 @@ fuzz/libFuzzer/* fuzz/corpus fuzz/out .chk -lib/liboqs/liboqs/* diff --git a/automation/clang-format/run_clang_format.sh b/automation/clang-format/run_clang_format.sh index 9b6537841..9f2b20db6 100755 --- a/automation/clang-format/run_clang_format.sh +++ b/automation/clang-format/run_clang_format.sh @@ -20,7 +20,6 @@ blocklist=( "./pkg" \ "./tests" \ "./lib/libpkix" \ - "./lib/liboqs" \ "./lib/zlib" \ "./lib/sqlite" \ "./gtests/google_test" \ diff --git a/automation/taskcluster/scripts/split.sh b/automation/taskcluster/scripts/split.sh index 06fd3726b..d4ed4cc00 100644 --- a/automation/taskcluster/scripts/split.sh +++ b/automation/taskcluster/scripts/split.sh @@ -55,7 +55,6 @@ split_softoken() { # nss/lib/freebl full directory # nss/lib/softoken full directory # nss/lib/softoken/dbm full directory - # nss/lib/liboqs full directory # Copy everything. cp -R $nssdir $dstdir @@ -80,7 +79,6 @@ split_softoken() { cp -R $nssdir/lib/freebl $dstdir/lib/freebl cp -R $nssdir/lib/softoken $dstdir/lib/softoken cp -R $nssdir/lib/sqlite $dstdir/lib/sqlite - cp -R $nssdir/lib/liboqs $dstdir/lib/liboqs mkdir $dstdir/cmd copy_top $nssdir/cmd $dstdir/cmd diff --git a/build.sh b/build.sh index 6d7b374fc..bbb8d04a4 100755 --- a/build.sh +++ b/build.sh @@ -123,7 +123,6 @@ while [ $# -gt 0 ]; do --with-nspr=?*) set_nspr_path "${1#*=}"; no_local_nspr=1 ;; --system-nspr) set_nspr_path "/usr/include/nspr/:"; no_local_nspr=1 ;; --system-sqlite) gyp_params+=(-Duse_system_sqlite=1) ;; - --system-liboqs) gyp_params+=(-Duse_system_liboqs=1) ;; --enable-fips) gyp_params+=(-Ddisable_fips=0) ;; --enable-libpkix) gyp_params+=(-Ddisable_libpkix=0) ;; --mozpkix-only) gyp_params+=(-Dmozpkix_only=1 -Ddisable_tests=1 -Dsign_libs=0) ;; diff --git a/coreconf/config.gypi b/coreconf/config.gypi index 5b3e75a27..85c8d36db 100644 --- a/coreconf/config.gypi +++ b/coreconf/config.gypi @@ -101,7 +101,6 @@ 'cc_is_gcc%': '<(cc_is_gcc)', 'cc_use_gnu_ld%': '<(cc_use_gnu_ld)', # Some defaults - 'use_system_liboqs%': 0, 'disable_arm_hw_aes%': 0, 'disable_arm_hw_sha1%': 0, 'disable_arm_hw_sha2%': 0, diff --git a/exports.gyp b/exports.gyp index 885347ac3..5cb44157f 100644 --- a/exports.gyp +++ b/exports.gyp @@ -36,7 +36,6 @@ 'lib/smime/exports.gyp:lib_smime_exports', 'lib/softoken/exports.gyp:lib_softoken_exports', 'lib/sqlite/exports.gyp:lib_sqlite_exports', - 'lib/liboqs/include/exports.gyp:lib_oqs_include_exports', 'lib/ssl/exports.gyp:lib_ssl_exports', 'lib/util/exports.gyp:lib_util_exports', 'lib/zlib/exports.gyp:lib_zlib_exports', diff --git a/help.txt b/help.txt index 6a72740b2..6034cfd41 100644 --- a/help.txt +++ b/help.txt @@ -5,8 +5,7 @@ Usage: build.sh [-h] [-c|-cc] [-v] [-j ] [--gyp|-g] [--opt|-o] [--fuzz[=tls|oss]] [--sancov[=edge|bb|func|...]] [--emit-llvm] [--no-zdefs] [--static] [--ct-verif] [--nspr|--with-nspr=:|--system-nspr] - [--system-sqlite] [--system-liboqs] - [--enable-fips] [--enable-libpkix] + [--system-sqlite] [--enable-fips] [--enable-libpkix] [--mozpkix-only] [-D] [--rebuild] [--enable-legacy-db] @@ -53,7 +52,6 @@ NSS build tool options: --system-nspr attempt to use system nspr shorthand for --with-nspr=/usr/include/nspr: --system-sqlite use system sqlite - --system-liboqs use system liboqs --enable-fips enable FIPS checks --enable-libpkix make libpkix part of the build --enable-legacy-db enable the legacy db (libnssdbm) diff --git a/lib/Makefile b/lib/Makefile index 4156e7614..6e26e3241 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -43,10 +43,6 @@ ifndef NSS_USE_SYSTEM_SQLITE SQLITE_SRCDIR = sqlite endif -ifndef NSS_USE_SYSTEM_LIBOQS -LIBOQS_SRCDIR = liboqs -endif - ifeq ($(OS_ARCH),Linux) SYSINIT_SRCDIR = sysinit endif @@ -80,7 +76,7 @@ else SOFTOKEN_SRCDIRS = \ $(DBM_SRCDIR) $(FREEBL_SRCDIR) $(SOFTOKEN_SRCDIR) \ - $(SQLITE_SRCDIR) $(LIBOQS_SRCDIR) $(NULL) + $(SQLITE_SRCDIR) $(NULL) ifneq (,$(FREEBL_SRCDIR)) $(FREEBL_SRCDIR): $(UTIL_SRCDIR) diff --git a/nss.gyp b/nss.gyp index 54d9c36bc..2a23b04f5 100644 --- a/nss.gyp +++ b/nss.gyp @@ -30,7 +30,6 @@ 'lib/nss/nss.gyp:nss3', 'lib/smime/smime.gyp:smime3', 'lib/sqlite/sqlite.gyp:sqlite3', - 'lib/liboqs/liboqs.gyp:oqs', 'lib/ssl/ssl.gyp:ssl3', 'lib/util/util.gyp:nssutil3', ], -- cgit v1.2.1