mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 858231: Upgrade to NSS 3.15 BETA 1 and adjust security/build to work with new NSS directory layout, r=bsmith
--HG-- rename : security/coreconf/AIX.mk => security/nss/coreconf/AIX.mk rename : security/coreconf/Android.mk => security/nss/coreconf/Android.mk rename : security/coreconf/BSD_OS.mk => security/nss/coreconf/BSD_OS.mk rename : security/coreconf/BeOS.mk => security/nss/coreconf/BeOS.mk rename : security/coreconf/Darwin.mk => security/nss/coreconf/Darwin.mk rename : security/coreconf/FreeBSD.mk => security/nss/coreconf/FreeBSD.mk rename : security/coreconf/HP-UX.mk => security/nss/coreconf/HP-UX.mk rename : security/coreconf/HP-UXA.09.03.mk => security/nss/coreconf/HP-UXA.09.03.mk rename : security/coreconf/HP-UXA.09.07.mk => security/nss/coreconf/HP-UXA.09.07.mk rename : security/coreconf/HP-UXA.09.mk => security/nss/coreconf/HP-UXA.09.mk rename : security/coreconf/HP-UXB.10.01.mk => security/nss/coreconf/HP-UXB.10.01.mk rename : security/coreconf/HP-UXB.10.10.mk => security/nss/coreconf/HP-UXB.10.10.mk rename : security/coreconf/HP-UXB.10.20.mk => security/nss/coreconf/HP-UXB.10.20.mk rename : security/coreconf/HP-UXB.10.30.mk => security/nss/coreconf/HP-UXB.10.30.mk rename : security/coreconf/HP-UXB.10.mk => security/nss/coreconf/HP-UXB.10.mk rename : security/coreconf/HP-UXB.11.00.mk => security/nss/coreconf/HP-UXB.11.00.mk rename : security/coreconf/HP-UXB.11.11.mk => security/nss/coreconf/HP-UXB.11.11.mk rename : security/coreconf/HP-UXB.11.20.mk => security/nss/coreconf/HP-UXB.11.20.mk rename : security/coreconf/HP-UXB.11.22.mk => security/nss/coreconf/HP-UXB.11.22.mk rename : security/coreconf/HP-UXB.11.23.mk => security/nss/coreconf/HP-UXB.11.23.mk rename : security/coreconf/HP-UXB.11.mk => security/nss/coreconf/HP-UXB.11.mk rename : security/coreconf/IRIX.mk => security/nss/coreconf/IRIX.mk rename : security/coreconf/IRIX5.2.mk => security/nss/coreconf/IRIX5.2.mk rename : security/coreconf/IRIX5.3.mk => security/nss/coreconf/IRIX5.3.mk rename : security/coreconf/IRIX5.mk => security/nss/coreconf/IRIX5.mk rename : security/coreconf/IRIX6.2.mk => security/nss/coreconf/IRIX6.2.mk rename : security/coreconf/IRIX6.3.mk => security/nss/coreconf/IRIX6.3.mk rename : security/coreconf/IRIX6.5.mk => security/nss/coreconf/IRIX6.5.mk rename : security/coreconf/IRIX6.mk => security/nss/coreconf/IRIX6.mk rename : security/coreconf/Linux.mk => security/nss/coreconf/Linux.mk rename : security/coreconf/Makefile => security/nss/coreconf/Makefile rename : security/coreconf/NCR3.0.mk => security/nss/coreconf/NCR3.0.mk rename : security/coreconf/NEC4.2.mk => security/nss/coreconf/NEC4.2.mk rename : security/coreconf/NetBSD.mk => security/nss/coreconf/NetBSD.mk rename : security/coreconf/OS2.mk => security/nss/coreconf/OS2.mk rename : security/coreconf/OSF1.mk => security/nss/coreconf/OSF1.mk rename : security/coreconf/OSF1V3.0.mk => security/nss/coreconf/OSF1V2.0.mk rename : security/coreconf/OSF1V3.0.mk => security/nss/coreconf/OSF1V3.0.mk rename : security/coreconf/OSF1V3.2.mk => security/nss/coreconf/OSF1V3.2.mk rename : security/coreconf/OSF1V4.0.mk => security/nss/coreconf/OSF1V4.0.mk rename : security/coreconf/OSF1V4.0B.mk => security/nss/coreconf/OSF1V4.0B.mk rename : security/coreconf/OSF1V4.0D.mk => security/nss/coreconf/OSF1V4.0D.mk rename : security/coreconf/OSF1V5.0.mk => security/nss/coreconf/OSF1V5.0.mk rename : security/coreconf/OSF1V5.1.mk => security/nss/coreconf/OSF1V5.1.mk rename : security/coreconf/OpenBSD.mk => security/nss/coreconf/OpenBSD.mk rename : security/coreconf/OpenUNIX.mk => security/nss/coreconf/OpenUNIX.mk rename : security/coreconf/QNX.mk => security/nss/coreconf/QNX.mk rename : security/coreconf/README => security/nss/coreconf/README rename : security/coreconf/RISCOS.mk => security/nss/coreconf/RISCOS.mk rename : security/coreconf/ReliantUNIX.mk => security/nss/coreconf/ReliantUNIX.mk rename : security/coreconf/ReliantUNIX5.4.mk => security/nss/coreconf/ReliantUNIX5.4.mk rename : security/coreconf/SCOOS5.0.mk => security/nss/coreconf/SCOOS5.0.mk rename : security/coreconf/SCO_SV3.2.mk => security/nss/coreconf/SCO_SV3.2.mk rename : security/coreconf/SunOS4.1.3_U1.mk => security/nss/coreconf/SunOS4.1.3_U1.mk rename : security/coreconf/UNIX.mk => security/nss/coreconf/UNIX.mk rename : security/coreconf/UNIXWARE2.1.mk => security/nss/coreconf/UNIXWARE2.1.mk rename : security/coreconf/WIN95.mk => security/nss/coreconf/WIN95.mk rename : security/coreconf/WINNT.mk => security/nss/coreconf/WINNT.mk rename : security/coreconf/arch.mk => security/nss/coreconf/arch.mk rename : security/coreconf/command.mk => security/nss/coreconf/command.mk rename : security/coreconf/coreconf.pl => security/nss/coreconf/coreconf.pl rename : security/coreconf/cpdist.pl => security/nss/coreconf/cpdist.pl rename : security/coreconf/headers.mk => security/nss/coreconf/headers.mk rename : security/coreconf/import.pl => security/nss/coreconf/import.pl rename : security/coreconf/jdk.mk => security/nss/coreconf/jdk.mk rename : security/coreconf/jniregen.pl => security/nss/coreconf/jniregen.pl rename : security/coreconf/location.mk => security/nss/coreconf/location.mk rename : security/coreconf/mkdepend/Makefile => security/nss/coreconf/mkdepend/Makefile rename : security/coreconf/mkdepend/cppsetup.c => security/nss/coreconf/mkdepend/cppsetup.c rename : security/coreconf/mkdepend/def.h => security/nss/coreconf/mkdepend/def.h rename : security/coreconf/mkdepend/ifparser.c => security/nss/coreconf/mkdepend/ifparser.c rename : security/coreconf/mkdepend/ifparser.h => security/nss/coreconf/mkdepend/ifparser.h rename : security/coreconf/mkdepend/imakemdep.h => security/nss/coreconf/mkdepend/imakemdep.h rename : security/coreconf/mkdepend/include.c => security/nss/coreconf/mkdepend/include.c rename : security/coreconf/mkdepend/main.c => security/nss/coreconf/mkdepend/main.c rename : security/coreconf/mkdepend/mkdepend.man => security/nss/coreconf/mkdepend/mkdepend.man rename : security/coreconf/mkdepend/parse.c => security/nss/coreconf/mkdepend/parse.c rename : security/coreconf/mkdepend/pr.c => security/nss/coreconf/mkdepend/pr.c rename : security/coreconf/module.mk => security/nss/coreconf/module.mk rename : security/coreconf/nsinstall/Makefile => security/nss/coreconf/nsinstall/Makefile rename : security/coreconf/nsinstall/nsinstall.c => security/nss/coreconf/nsinstall/nsinstall.c rename : security/coreconf/nsinstall/pathsub.c => security/nss/coreconf/nsinstall/pathsub.c rename : security/coreconf/nsinstall/pathsub.h => security/nss/coreconf/nsinstall/pathsub.h rename : security/coreconf/nsinstall/sunos4.h => security/nss/coreconf/nsinstall/sunos4.h rename : security/coreconf/outofdate.pl => security/nss/coreconf/outofdate.pl rename : security/coreconf/prefix.mk => security/nss/coreconf/prefix.mk rename : security/coreconf/release.pl => security/nss/coreconf/release.pl rename : security/coreconf/rules.mk => security/nss/coreconf/rules.mk rename : security/coreconf/ruleset.mk => security/nss/coreconf/ruleset.mk rename : security/coreconf/source.mk => security/nss/coreconf/source.mk rename : security/coreconf/suffix.mk => security/nss/coreconf/suffix.mk rename : security/coreconf/tree.mk => security/nss/coreconf/tree.mk rename : security/coreconf/version.mk => security/nss/coreconf/version.mk rename : security/coreconf/version.pl => security/nss/coreconf/version.pl rename : security/dbm/config/config.mk => security/nss/lib/dbm/config/config.mk rename : dbm/include/cdefs.h => security/nss/lib/dbm/include/cdefs.h rename : dbm/include/extern.h => security/nss/lib/dbm/include/extern.h rename : dbm/include/hash.h => security/nss/lib/dbm/include/hash.h rename : dbm/include/search.h => security/nss/lib/dbm/include/hsearch.h rename : dbm/include/mcom_db.h => security/nss/lib/dbm/include/mcom_db.h rename : dbm/include/mpool.h => security/nss/lib/dbm/include/mpool.h rename : dbm/include/ncompat.h => security/nss/lib/dbm/include/ncompat.h rename : dbm/include/page.h => security/nss/lib/dbm/include/page.h rename : dbm/include/queue.h => security/nss/lib/dbm/include/queue.h rename : dbm/include/search.h => security/nss/lib/dbm/include/search.h rename : dbm/include/winfile.h => security/nss/lib/dbm/include/winfile.h rename : dbm/src/db.c => security/nss/lib/dbm/src/db.c rename : security/dbm/src/dirent.c => security/nss/lib/dbm/src/dirent.c rename : security/dbm/src/dirent.h => security/nss/lib/dbm/src/dirent.h rename : dbm/src/h_bigkey.c => security/nss/lib/dbm/src/h_bigkey.c rename : dbm/src/h_func.c => security/nss/lib/dbm/src/h_func.c rename : dbm/src/h_log2.c => security/nss/lib/dbm/src/h_log2.c rename : dbm/src/h_page.c => security/nss/lib/dbm/src/h_page.c rename : dbm/src/hash.c => security/nss/lib/dbm/src/hash.c rename : dbm/src/hash_buf.c => security/nss/lib/dbm/src/hash_buf.c rename : dbm/src/memmove.c => security/nss/lib/dbm/src/memmove.c rename : dbm/src/mktemp.c => security/nss/lib/dbm/src/mktemp.c rename : dbm/src/snprintf.c => security/nss/lib/dbm/src/snprintf.c rename : dbm/src/strerror.c => security/nss/lib/dbm/src/strerror.c rename : dbm/tests/dbmtest.pkg => security/nss/lib/dbm/tests/dbmtest.pkg rename : dbm/tests/lots.c => security/nss/lib/dbm/tests/lots.c extra : rebase_source : 119dad5f824e8e760182047fd32e2a0d0f944172 extra : amend_source : 98e24aa51f9044d9091a26f013b643925e8f9dcf
This commit is contained in:
parent
8fdb137a0b
commit
5776e92058
@ -3964,7 +3964,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
|
||||
_USE_SYSTEM_NSS=1 )
|
||||
|
||||
if test -n "$_USE_SYSTEM_NSS"; then
|
||||
AM_PATH_NSS(3.14.3, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
|
||||
AM_PATH_NSS(3.5, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
|
||||
fi
|
||||
|
||||
if test -n "$MOZ_NATIVE_NSS"; then
|
||||
|
@ -1 +0,0 @@
|
||||
Makefile
|
@ -1 +0,0 @@
|
||||
Makefile
|
@ -1,39 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = dbm
|
||||
|
||||
EXPORTS = \
|
||||
nsres.h \
|
||||
cdefs.h \
|
||||
mcom_db.h \
|
||||
ncompat.h \
|
||||
winfile.h \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
PRIVATE_EXPORTS = \
|
||||
hsearch.h \
|
||||
page.h \
|
||||
extern.h \
|
||||
ndbm.h \
|
||||
queue.h \
|
||||
hash.h \
|
||||
mpool.h \
|
||||
search.h \
|
||||
$(NULL)
|
||||
|
||||
PRIVATE_EXPORTS := $(addprefix $(srcdir)/, $(PRIVATE_EXPORTS))
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -1,45 +0,0 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Makefile to build the cert library
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
!if "$(MOZ_BITS)" == "16"
|
||||
!ifndef MOZ_DEBUG
|
||||
OPTIMIZER=-Os -UDEBUG -DNDEBUG
|
||||
!endif
|
||||
!endif
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Specify the depth of the current directory relative to the
|
||||
#// root of NS
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
DEPTH= ..\..
|
||||
|
||||
!ifndef MAKE_OBJ_TYPE
|
||||
MAKE_OBJ_TYPE=EXE
|
||||
!endif
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// install headers
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
EXPORTS=nsres.h cdefs.h mcom_db.h ncompat.h winfile.h
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Include the common makefile rules
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
include <$(DEPTH)/config/rules.mak>
|
||||
|
||||
CFLAGS = $(CFLAGS) -DMOZILLA_CLIENT
|
||||
|
@ -1 +0,0 @@
|
||||
Makefile
|
@ -1,59 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = mozdbm_s
|
||||
LIB_IS_C_ONLY = 1
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LIBRARY_NAME = dbm$(MOZ_BITS)
|
||||
endif
|
||||
|
||||
CSRCS = \
|
||||
db.c \
|
||||
h_bigkey.c \
|
||||
h_func.c \
|
||||
h_log2.c \
|
||||
h_page.c \
|
||||
hash.c \
|
||||
hash_buf.c \
|
||||
hsearch.c \
|
||||
mktemp.c \
|
||||
ndbm.c \
|
||||
strerror.c \
|
||||
nsres.c \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
CSRCS += memmove.c snprintf.c
|
||||
else
|
||||
ifeq (,$(filter -DHAVE_MEMMOVE=1,$(ACDEFINES)))
|
||||
CSRCS += memmove.c
|
||||
endif
|
||||
|
||||
ifeq (,$(filter -DHAVE_SNPRINTF=1,$(ACDEFINES)))
|
||||
CSRCS += snprintf.c
|
||||
endif
|
||||
endif # WINNT
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../include
|
||||
|
||||
FORCE_STATIC_LIB = 1
|
||||
FORCE_USE_PIC = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG)
|
||||
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
OS_LIBS += -lc_r
|
||||
endif
|
||||
|
@ -1,81 +0,0 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Makefile to build the cert library
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
!if "$(MOZ_BITS)" == "16"
|
||||
!ifndef MOZ_DEBUG
|
||||
OPTIMIZER=-Os -UDEBUG -DNDEBUG
|
||||
!endif
|
||||
!endif
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Specify the depth of the current directory relative to the
|
||||
#// root of NS
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
DEPTH= ..\..
|
||||
|
||||
!ifndef MAKE_OBJ_TYPE
|
||||
MAKE_OBJ_TYPE=EXE
|
||||
!endif
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
LIBNAME=dbm$(MOZ_BITS)
|
||||
PDBFILE=$(LIBNAME).pdb
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define the files necessary to build the target (ie. OBJS)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
OBJS= \
|
||||
.\$(OBJDIR)\db.obj \
|
||||
.\$(OBJDIR)\h_bigkey.obj \
|
||||
.\$(OBJDIR)\h_func.obj \
|
||||
.\$(OBJDIR)\h_log2.obj \
|
||||
.\$(OBJDIR)\h_page.obj \
|
||||
.\$(OBJDIR)\hash.obj \
|
||||
.\$(OBJDIR)\hash_buf.obj \
|
||||
.\$(OBJDIR)\hsearch.obj \
|
||||
.\$(OBJDIR)\memmove.obj \
|
||||
.\$(OBJDIR)\mktemp.obj \
|
||||
.\$(OBJDIR)\ndbm.obj \
|
||||
.\$(OBJDIR)\snprintf.obj \
|
||||
.\$(OBJDIR)\strerror.obj \
|
||||
.\$(OBJDIR)\nsres.obj \
|
||||
$(NULL)
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
|
||||
#// (these must be defined before the common makefiles are included)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
LIBRARY = .\$(OBJDIR)\$(LIBNAME).lib
|
||||
LINCS = -I..\include
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Include the common makefile rules
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
include <$(DEPTH)/config/rules.mak>
|
||||
|
||||
CFLAGS = $(CFLAGS) -DMOZILLA_CLIENT -D__DBINTERFACE_PRIVATE
|
||||
|
||||
install:: $(LIBRARY)
|
||||
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
|
||||
|
||||
|
@ -1,3 +0,0 @@
|
||||
Makefile
|
||||
lots
|
||||
test.db
|
@ -1,30 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = dbm
|
||||
|
||||
PACKAGE_FILE = dbmtest.pkg
|
||||
|
||||
PROGRAM = lots$(BIN_SUFFIX)
|
||||
|
||||
CSRCS = lots.c
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
EXTRA_DSO_LIBS = dbm$(MOZ_BITS)
|
||||
else
|
||||
EXTRA_DSO_LIBS = mozdbm_s
|
||||
endif
|
||||
|
||||
LIBS = $(EXTRA_DSO_LIBS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -298,11 +298,12 @@ NSS_SRCDIR = $(topsrcdir)
|
||||
endif
|
||||
|
||||
NSS_DIRS =
|
||||
ifndef NSS_DISABLE_DBM
|
||||
NSS_DIRS += dbm
|
||||
endif
|
||||
ifndef MOZ_FOLD_LIBS
|
||||
NSS_DIRS += nss/lib
|
||||
else
|
||||
ifndef NSS_DISABLE_DBM
|
||||
NSS_DIRS += nss/lib/dbm
|
||||
endif
|
||||
endif
|
||||
NSS_DIRS += \
|
||||
nss/cmd/lib \
|
||||
@ -440,7 +441,7 @@ libs-nss/lib/ckfw: libs-nss/lib/nss/../base $(NSPR_IMPORT_LIBS)
|
||||
libs-nss/lib/softoken: $(NSPR_IMPORT_LIBS) $(SQLITE_IMPORT_LIB)
|
||||
libs-nss/lib/softoken: libs-nss/lib/freebl
|
||||
ifndef NSS_DISABLE_DBM
|
||||
libs-nss/lib/softoken: libs-dbm
|
||||
libs-nss/lib/softoken: libs-nss/lib/dbm
|
||||
endif
|
||||
libs-nss/lib/softoken: $(DIST)/lib/$(IMPORT_PREFIX)nssutil3$(IMPORT_SUFFIX)
|
||||
libs-nss/lib/freebl: $(DIST)/lib/$(IMPORT_PREFIX)nssutil3$(IMPORT_SUFFIX) $(NSPR_IMPORT_LIBS)
|
||||
@ -489,10 +490,6 @@ else
|
||||
$(NSS_CMD_TARGETS): libs-nss/lib libs-nss/cmd/lib
|
||||
endif # MOZ_FOLD_LIBS
|
||||
|
||||
ifndef NSS_DISABLE_DBM
|
||||
libs-nss/lib: libs-dbm
|
||||
endif
|
||||
|
||||
# Work around NSS build system race condition creating certdata.c in
|
||||
# security/nss/lib/ckfw/builtins. See bug #836220.
|
||||
libs-nss/lib: $(call mkdir_deps,../nss/lib/ckfw/builtins)
|
||||
|
@ -1,12 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/SunOS5.mk
|
||||
|
||||
ifeq ($(OS_RELEASE),5.10)
|
||||
OS_DEFINES += -DSOLARIS2_10
|
||||
endif
|
||||
|
||||
OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
|
@ -1,19 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/SunOS5.mk
|
||||
|
||||
ifeq ($(USE_64),1)
|
||||
CPU_ARCH = x86_64
|
||||
else
|
||||
CPU_ARCH = x86
|
||||
OS_DEFINES += -Di386
|
||||
endif
|
||||
|
||||
ifeq ($(OS_RELEASE),5.10_i86pc)
|
||||
OS_DEFINES += -DSOLARIS2_10
|
||||
endif
|
||||
|
||||
OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
|
@ -1,12 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/SunOS5.mk
|
||||
|
||||
ifeq ($(OS_RELEASE),5.11)
|
||||
OS_DEFINES += -DSOLARIS2_11
|
||||
endif
|
||||
|
||||
OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
|
@ -1,19 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/SunOS5.mk
|
||||
|
||||
ifeq ($(USE_64),1)
|
||||
CPU_ARCH = x86_64
|
||||
else
|
||||
CPU_ARCH = x86
|
||||
OS_DEFINES += -Di386
|
||||
endif
|
||||
|
||||
ifeq ($(OS_RELEASE),5.11_i86pc)
|
||||
OS_DEFINES += -DSOLARIS2_11
|
||||
endif
|
||||
|
||||
OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
|
@ -1,16 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/SunOS5.mk
|
||||
|
||||
CPU_ARCH = x86
|
||||
ARCHFLAG =
|
||||
OS_DEFINES += -Di386
|
||||
|
||||
ifeq ($(OS_RELEASE),5.8_i86pc)
|
||||
OS_DEFINES += -DSOLARIS2_8
|
||||
endif
|
||||
|
||||
OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
|
@ -1,12 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/SunOS5.mk
|
||||
|
||||
ifeq ($(OS_RELEASE),5.9)
|
||||
OS_DEFINES += -DSOLARIS2_9
|
||||
endif
|
||||
|
||||
OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
|
@ -1,16 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/SunOS5.mk
|
||||
|
||||
CPU_ARCH = x86
|
||||
ARCHFLAG =
|
||||
OS_DEFINES += -Di386
|
||||
|
||||
ifeq ($(OS_RELEASE),5.9_i86pc)
|
||||
OS_DEFINES += -DSOLARIS2_9
|
||||
endif
|
||||
|
||||
OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
|
@ -44,9 +44,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
||||
# (7) Execute "local" rules. (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
nss_build_all: build_coreconf build_nspr build_dbm all
|
||||
nss_build_all: build_coreconf build_nspr all
|
||||
|
||||
nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
|
||||
nss_clean_all: clobber_coreconf clobber_nspr clobber
|
||||
|
||||
build_coreconf:
|
||||
$(MAKE) -C $(CORE_DEPTH)/coreconf
|
||||
@ -54,8 +54,8 @@ build_coreconf:
|
||||
clobber_coreconf:
|
||||
$(MAKE) -C $(CORE_DEPTH)/coreconf clobber
|
||||
|
||||
NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)/config.status
|
||||
NSPR_CONFIGURE = $(CORE_DEPTH)/../nsprpub/configure
|
||||
NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
|
||||
NSPR_CONFIGURE = $(CORE_DEPTH)/../nspr/configure
|
||||
|
||||
#
|
||||
# Translate coreconf build options to NSPR configure options.
|
||||
@ -96,34 +96,30 @@ USEABSPATH="NO"
|
||||
endif
|
||||
endif
|
||||
ifeq ($(USEABSPATH),"YES")
|
||||
NSPR_PREFIX = $(shell pwd)/../../dist/$(OBJDIR_NAME)
|
||||
NSPR_PREFIX = $(shell pwd)/../dist/$(OBJDIR_NAME)
|
||||
else
|
||||
NSPR_PREFIX = $$(topsrcdir)/../dist/$(OBJDIR_NAME)
|
||||
endif
|
||||
|
||||
$(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
|
||||
$(NSINSTALL) -D $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
|
||||
cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; \
|
||||
$(NSINSTALL) -D $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
|
||||
cd $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) ; \
|
||||
$(NSPR_COMPILERS) sh ../configure \
|
||||
$(NSPR_CONFIGURE_OPTS) \
|
||||
--with-dist-prefix='$(NSPR_PREFIX)' \
|
||||
--with-dist-includedir='$(NSPR_PREFIX)/include'
|
||||
|
||||
build_nspr: $(NSPR_CONFIG_STATUS)
|
||||
$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
|
||||
$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
|
||||
|
||||
clobber_nspr: $(NSPR_CONFIG_STATUS)
|
||||
$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber
|
||||
$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
|
||||
|
||||
build_dbm:
|
||||
ifdef NSS_DISABLE_DBM
|
||||
@echo "skipping the build of DBM"
|
||||
else
|
||||
$(MAKE) -C $(CORE_DEPTH)/dbm export libs
|
||||
endif
|
||||
build_docs:
|
||||
$(MAKE) -C $(CORE_DEPTH)/doc
|
||||
|
||||
clobber_dbm:
|
||||
$(MAKE) -C $(CORE_DEPTH)/dbm clobber
|
||||
clean_docs:
|
||||
$(MAKE) -C $(CORE_DEPTH)/doc clean
|
||||
|
||||
moz_import::
|
||||
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
|
||||
@ -148,7 +144,7 @@ else
|
||||
endif
|
||||
endif
|
||||
|
||||
nss_RelEng_bld: build_coreconf import build_dbm all
|
||||
nss_RelEng_bld: build_coreconf import all
|
||||
|
||||
package:
|
||||
$(MAKE) -C pkg publish
|
||||
|
@ -1 +1 @@
|
||||
NSS_3_14_3_RTM
|
||||
NSS_3_15_BETA1
|
||||
|
@ -4,8 +4,8 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
CORE_DEPTH = ../..
|
||||
DEPTH = ../..
|
||||
CORE_DEPTH = ..
|
||||
DEPTH = ..
|
||||
|
||||
include manifest.mn
|
||||
include $(CORE_DEPTH)/coreconf/config.mk
|
||||
|
@ -5,7 +5,7 @@
|
||||
/*
|
||||
* Tool for converting builtin CA certs.
|
||||
*
|
||||
* $Id: addbuiltin.c,v 1.20 2012/11/29 02:11:04 bsmith%mozilla.com Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#include "nssrenam.h"
|
||||
@ -266,7 +266,7 @@ void printheader() {
|
||||
"# License, v. 2.0. If a copy of the MPL was not distributed with this\n"
|
||||
"# file, You can obtain one at http://mozilla.org/MPL/2.0/.\n"
|
||||
"#\n"
|
||||
"CVS_ID \"@(#) $RCSfile: addbuiltin.c,v $ $Revision: 1.20 $ $Date: 2012/11/29 02:11:04 $\"\n"
|
||||
"CVS_ID \"@(#) $RCSfile$ $Revision$ $Date$\"\n"
|
||||
"\n"
|
||||
"#\n"
|
||||
"# certdata.txt\n"
|
||||
|
@ -3,7 +3,7 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
CORE_DEPTH = ../../..
|
||||
CORE_DEPTH = ../..
|
||||
|
||||
# MODULE public and private header directories are implicitly REQUIRED.
|
||||
MODULE = nss
|
||||
|
@ -3,7 +3,7 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
CORE_DEPTH = ../../..
|
||||
CORE_DEPTH = ../..
|
||||
|
||||
# MODULE public and private header directories are implicitly REQUIRED.
|
||||
MODULE = nss
|
||||
|
@ -2,7 +2,7 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
CORE_DEPTH = ../../..
|
||||
CORE_DEPTH = ../..
|
||||
|
||||
MODULE = nss
|
||||
|
||||
|
@ -0,0 +1 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
@ -0,0 +1 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
@ -1 +0,0 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
@ -1 +0,0 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
@ -1 +0,0 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
1
security/nss/cmd/bltest/tests/aes_gcm/aad15
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/aad15
Normal file
@ -0,0 +1 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
1
security/nss/cmd/bltest/tests/aes_gcm/aad16
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/aad16
Normal file
@ -0,0 +1 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
1
security/nss/cmd/bltest/tests/aes_gcm/aad17
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/aad17
Normal file
@ -0,0 +1 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
@ -1 +0,0 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
@ -0,0 +1 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
@ -1 +0,0 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
@ -1 +0,0 @@
|
||||
<EFBFBD>燁ボュセ<EFBFBD>燁ボュセ<EFBFBD>ュレメ
|
@ -1 +1 @@
|
||||
A4jazmC2o5LzKMK5cbL+eKtuR9Qs7BO99TpnshJXvd8=
|
||||
WOL8zvp+MGE2fx1XpOdFWg==
|
||||
|
@ -1,2 +1 @@
|
||||
QoMewiF3dCRLciG3hNDUnOOqIS8sAqTgNcF+IymsoS4h1RSyVGaTHH2PalqshKoF
|
||||
G6MLOWoKrJc9WOCRRz9ZhU1cKvMnzWSmLPNavSum+rQ=
|
||||
A4jazmC2o5LzKMK5cbL+eKtuR9Qs7BO99TpnshJXvd8=
|
||||
|
@ -1 +1,2 @@
|
||||
zqdAPU1ga24HTsXTuvOdGNDRyKeZmWvwJluYtdSKuRk=
|
||||
DxD1ma4UoVTtJLNuJTJNuMVmYy7yu7NPg0coD8RQcFf93CnfmkcfdcZlQdTU2tHJ
|
||||
6ToZpY6LRz+g8GL3ZdzFf89iOiQJT8ykDTUz+A==
|
||||
|
@ -1,2 +1,2 @@
|
||||
Ui3B8JlWfQf0fzejKoRCfWQ6jNy/5cDJdZiivSVV0aqMsI5IWQ27PaewixBWgog4
|
||||
xfYeY5O6egq8yfZiiYAVrbCU2sXZNHG97BpQInDjzGw=
|
||||
0n6IaBzjJDxIMBZaj9z5/x3podjmtEfvbve3mChmbkWB55ASrzTd2eLwN1ibKS2z
|
||||
5nwDZ0X6Iufptzc73PVm/ykcJbu4Vo/D03am2Q==
|
||||
|
@ -1,2 +1 @@
|
||||
Ui3B8JlWfQf0fzejKoRCfWQ6jNy/5cDJdZiivSVV0aqMsI5IWQ27PaewixBWgog4
|
||||
xfYeY5O6egq8yfZidvxuzg9OF2jN34hTuy1VGw==
|
||||
Uw+K+8dFNrmpY7TxxMtziw==
|
||||
|
@ -1,2 +1 @@
|
||||
w3Yt8cp4fTKuR8E78ZhEy68a4U0Ll2r6xS/315u6neD+tYLTOTSk8JVMwjY7xz94
|
||||
YqxDDmSr5Jn0fJsfOjN9v0anksReRUkT/i6o8g==
|
||||
zqdAPU1ga24HTsXTuvOdGNDRyKeZmWvwJluYtdSKuRk=
|
||||
|
@ -1,2 +1,2 @@
|
||||
Wo3vLwyeU/H3XXhTZZ4qIO6ysiqv3mQZoFirT290a/QPwMO3gPJERS2j6/HF2Cze
|
||||
okGJlyAO+C5Ern4/pEqCZu4cjrDItdTPWunxmg==
|
||||
Ui3B8JlWfQf0fzejKoRCfWQ6jNy/5cDJdZiivSVV0aqMsI5IWQ27PaewixBWgog4
|
||||
xfYeY5O6egq8yfZiiYAVrbCU2sXZNHG97BpQInDjzGw=
|
||||
|
2
security/nss/cmd/bltest/tests/aes_gcm/ciphertext15
Normal file
2
security/nss/cmd/bltest/tests/aes_gcm/ciphertext15
Normal file
@ -0,0 +1,2 @@
|
||||
Ui3B8JlWfQf0fzejKoRCfWQ6jNy/5cDJdZiivSVV0aqMsI5IWQ27PaewixBWgog4
|
||||
xfYeY5O6egq8yfZidvxuzg9OF2jN34hTuy1VGw==
|
2
security/nss/cmd/bltest/tests/aes_gcm/ciphertext16
Normal file
2
security/nss/cmd/bltest/tests/aes_gcm/ciphertext16
Normal file
@ -0,0 +1,2 @@
|
||||
w3Yt8cp4fTKuR8E78ZhEy68a4U0Ll2r6xS/315u6neD+tYLTOTSk8JVMwjY7xz94
|
||||
YqxDDmSr5Jn0fJsfOjN9v0anksReRUkT/i6o8g==
|
2
security/nss/cmd/bltest/tests/aes_gcm/ciphertext17
Normal file
2
security/nss/cmd/bltest/tests/aes_gcm/ciphertext17
Normal file
@ -0,0 +1,2 @@
|
||||
Wo3vLwyeU/H3XXhTZZ4qIO6ysiqv3mQZoFirT290a/QPwMO3gPJERS2j6/HF2Cze
|
||||
okGJlyAO+C5Ern4/pEqCZu4cjrDItdTPWunxmg==
|
@ -1,2 +1,2 @@
|
||||
QoMewiF3dCRLciG3hNDUnOOqIS8sAqTgNcF+IymsoS4h1RSyVGaTHH2PalqshKoF
|
||||
G6MLOWoKrJc9WOCRW8lPvDIhpduU+ula5xIaRw==
|
||||
G6MLOWoKrJc9WOCRRz9ZhU1cKvMnzWSmLPNavSum+rQ=
|
||||
|
@ -1,2 +1,2 @@
|
||||
YTU7TCgGk0p3f/UfoipHVWmbKnFPzcb4N2bl+XtsdCNzgGkA5J8ksisJdUTUiWtC
|
||||
SYm14eusDwfCP0WYNhLS5547B4VWG+FKrKL8yw==
|
||||
QoMewiF3dCRLciG3hNDUnOOqIS8sAqTgNcF+IymsoS4h1RSyVGaTHH2PalqshKoF
|
||||
G6MLOWoKrJc9WOCRW8lPvDIhpduU+ula5xIaRw==
|
||||
|
@ -1,2 +1,2 @@
|
||||
jOJJmGJWFbYDoDOsoT+4lL6REqXDohGouiYqPMp+LKcB5Kmk+6Q8kMzcsoHUjHxv
|
||||
1ih10qykFwNMNK7lYZzFrv/+C/pGKvQ8FpnQUA==
|
||||
YTU7TCgGk0p3f/UfoipHVWmbKnFPzcb4N2bl+XtsdCNzgGkA5J8ksisJdUTUiWtC
|
||||
SYm14eusDwfCP0WYNhLS5547B4VWG+FKrKL8yw==
|
||||
|
@ -1 +1,2 @@
|
||||
mOckfAfw/kEcJn5DhLD2AC/1jYADOSerjvTUWHUU8Ps=
|
||||
jOJJmGJWFbYDoDOsoT+4lL6REqXDohGouiYqPMp+LKcB5Kmk+6Q8kMzcsoHUjHxv
|
||||
1ih10qykFwNMNK7lYZzFrv/+C/pGKvQ8FpnQUA==
|
||||
|
@ -1,2 +1 @@
|
||||
OYDKCzwA6EHrBvrEhyonV4WeHOqm79mEYoWTtAyh4Zx9dz0AwUTFJaxhnRjISj9H
|
||||
GOJEiy/jJNnM2icQrK3iVpkkp8hYcza/sRgCTbhnShQ=
|
||||
zTOyisdz90ugDtHzElckNQ==
|
||||
|
@ -1,2 +1 @@
|
||||
OYDKCzwA6EHrBvrEhyonV4WeHOqm79mEYoWTtAyh4Zx9dz0AwUTFJaxhnRjISj9H
|
||||
GOJEiy/jJNnM2icQJRlJjoDxR483ulW9bSdhjA==
|
||||
mOckfAfw/kEcJn5DhLD2AC/1jYADOSerjvTUWHUU8Ps=
|
||||
|
@ -1,2 +1,2 @@
|
||||
DxD1ma4UoVTtJLNuJTJNuMVmYy7yu7NPg0coD8RQcFf93CnfmkcfdcZlQdTU2tHJ
|
||||
6ToZpY6LRz+g8GL3ZdzFf89iOiQJT8ykDTUz+A==
|
||||
OYDKCzwA6EHrBvrEhyonV4WeHOqm79mEYoWTtAyh4Zx9dz0AwUTFJaxhnRjISj9H
|
||||
GOJEiy/jJNnM2icQrK3iVpkkp8hYcza/sRgCTbhnShQ=
|
||||
|
@ -1,2 +1,2 @@
|
||||
0n6IaBzjJDxIMBZaj9z5/x3podjmtEfvbve3mChmbkWB55ASrzTd2eLwN1ibKS2z
|
||||
5nwDZ0X6Iufptzc73PVm/ykcJbu4Vo/D03am2Q==
|
||||
OYDKCzwA6EHrBvrEhyonV4WeHOqm79mEYoWTtAyh4Zx9dz0AwUTFJaxhnRjISj9H
|
||||
GOJEiy/jJNnM2icQJRlJjoDxR483ulW9bSdhjA==
|
||||
|
68
security/nss/cmd/bltest/tests/aes_gcm/hex.c
Normal file
68
security/nss/cmd/bltest/tests/aes_gcm/hex.c
Normal file
@ -0,0 +1,68 @@
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
int tohex(int c)
|
||||
{
|
||||
if ((c >= '0') && (c <= '9')) {
|
||||
return c - '0';
|
||||
}
|
||||
if ((c >= 'a') && (c <= 'f')) {
|
||||
return c - 'a' + 10;
|
||||
}
|
||||
if ((c >= 'A') && (c <= 'F')) {
|
||||
return c - 'A' + 10;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int isspace(int c)
|
||||
{
|
||||
if (c <= ' ') return 1;
|
||||
if (c == '\n') return 1;
|
||||
if (c == '\t') return 1;
|
||||
if (c == ':') return 1;
|
||||
if (c == ';') return 1;
|
||||
if (c == ',') return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void verify_nibble(int nibble, int current)
|
||||
{
|
||||
if (nibble != 0) {
|
||||
fprintf(stderr,"count mismatch %d (nibbles=0x%x)\n",nibble,current);
|
||||
fflush(stderr);
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int c;
|
||||
int current = 0;
|
||||
int nibble = 0;
|
||||
int skip = 0;
|
||||
|
||||
if (argv[1]) {
|
||||
skip = atoi(argv[1]);
|
||||
}
|
||||
|
||||
#define NIBBLE_COUNT 2
|
||||
while ((c=getchar()) != EOF) {
|
||||
if (isspace(c)) {
|
||||
verify_nibble(nibble,current);
|
||||
continue;
|
||||
}
|
||||
if (skip) {
|
||||
skip--;
|
||||
continue;
|
||||
}
|
||||
current = current << 4 | tohex(c);
|
||||
nibble++;
|
||||
if (nibble == NIBBLE_COUNT) {
|
||||
putchar(current);
|
||||
nibble = 0;
|
||||
current = 0;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
ハ<EFBFBD>コセ昀ロュ゙ハ<EFBFBD>
|
||||
“"]ø„åU<C3A5>œZÿRiªjz•8SO}¡äÃÒ£§(ÃÀÉQV€•9üðâBškRT®Ûõ ÞjW¦7³›
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
“"]ø„åU<C3A5>œZÿRiªjz•8SO}¡äÃÒ£§(ÃÀÉQV€•9üðâBškRT®Ûõ ÞjW¦7³›
|
||||
ハ<EFBFBD>コセ昀ロュ゙ハ<EFBFBD>
|
1
security/nss/cmd/bltest/tests/aes_gcm/iv15
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/iv15
Normal file
@ -0,0 +1 @@
|
||||
ハ<EFBFBD>コセ昀ロュ゙ハ<EFBFBD>
|
1
security/nss/cmd/bltest/tests/aes_gcm/iv16
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/iv16
Normal file
@ -0,0 +1 @@
|
||||
ハ<EFBFBD>コセ昀ロュ
|
1
security/nss/cmd/bltest/tests/aes_gcm/iv17
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/iv17
Normal file
@ -0,0 +1 @@
|
||||
“"]ø„åU<C3A5>œZÿRiªjz•8SO}¡äÃÒ£§(ÃÀÉQV€•9üðâBškRT®Ûõ ÞjW¦7³›
|
@ -1 +1 @@
|
||||
ハ<EFBFBD>コセ昀ロュ
|
||||
ハ<EFBFBD>コセ昀ロュ゙ハ<EFBFBD>
|
@ -1 +1 @@
|
||||
“"]ø„åU<C3A5>œZÿRiªjz•8SO}¡äÃÒ£§(ÃÀÉQV€•9üðâBškRT®Ûõ ÞjW¦7³›
|
||||
ハ<EFBFBD>コセ昀ロュ
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
ハ<EFBFBD>コセ昀ロュ
|
||||
ハ<EFBFBD>コセ昀ロュ゙ハ<EFBFBD>
|
@ -1 +1 @@
|
||||
“"]ø„åU<C3A5>œZÿRiªjz•8SO}¡äÃÒ£§(ÃÀÉQV€•9üðâBškRT®Ûõ ÞjW¦7³›
|
||||
ハ<EFBFBD>コセ昀ロュ゙ハ<EFBFBD>
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
虥猜浪辔朰茈虥猜浪辔朰茈
|
||||
虥猜浪辔朰茈虥猜
|
Binary file not shown.
Binary file not shown.
1
security/nss/cmd/bltest/tests/aes_gcm/key15
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/key15
Normal file
@ -0,0 +1 @@
|
||||
虥猜浪辔朰茈虥猜浪辔朰茈
|
1
security/nss/cmd/bltest/tests/aes_gcm/key16
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/key16
Normal file
@ -0,0 +1 @@
|
||||
虥猜浪辔朰茈虥猜浪辔朰茈
|
1
security/nss/cmd/bltest/tests/aes_gcm/key17
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/key17
Normal file
@ -0,0 +1 @@
|
||||
虥猜浪辔朰茈虥猜浪辔朰茈
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
|
||||
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
|
||||
do
|
||||
file="test$i.txt"
|
||||
grep K= $file | sed -e 's;K=;;' | hex > key$i
|
||||
|
@ -1 +1 @@
|
||||
15
|
||||
18
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9¯ÒU
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9
|
@ -1 +0,0 @@
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9
|
Binary file not shown.
@ -1 +1 @@
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9¯ÒU
|
1
security/nss/cmd/bltest/tests/aes_gcm/plaintext15
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/plaintext15
Normal file
@ -0,0 +1 @@
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9
|
1
security/nss/cmd/bltest/tests/aes_gcm/plaintext16
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/plaintext16
Normal file
@ -0,0 +1 @@
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9
|
1
security/nss/cmd/bltest/tests/aes_gcm/plaintext17
Normal file
1
security/nss/cmd/bltest/tests/aes_gcm/plaintext17
Normal file
@ -0,0 +1 @@
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9
|
@ -1 +1 @@
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9¯ÒU
|
Binary file not shown.
@ -1 +0,0 @@
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9¯ÒU
|
Binary file not shown.
@ -1 +1 @@
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9
|
||||
Ù12%ø„å¥Y ůõ&š†§©S4÷Ú.L0=Š1Šr<••h S/Ï$I¦µ%±jíõª
æWºc{9¯ÒU
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user