[nss-softokn] - Update to NSS_3_13_RC and bootstrap the sytem phase 2
Elio Maldonado
emaldonado at fedoraproject.org
Mon Oct 10 01:34:16 UTC 2011
commit e11eda4d108c7c11fecc77ab42554467a931e83e
Author: Elio Maldonado <emaldona at redhat.com>
Date: Sun Oct 9 18:27:23 2011 -0700
- Update to NSS_3_13_RC and bootstrap the sytem phase 2
- Update the sources with the bltest fipstest tools and tools support library
- Update the minimal test support patch so the tools can compile
- Reenable executing the cipher test suite in the check section
- Still including the util sources in the tree until bootstrapping is complete
nss-softokn.spec | 19 +++-
nss-split-softokn.sh | 69 ++++++------
softoken-minimal-test-dependencies.patch | 168 +++++++++++++++---------------
sources | 2 +-
4 files changed, 131 insertions(+), 127 deletions(-)
---
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 5a98949..59d0b1b 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -17,7 +17,7 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
Version: 3.13
-Release: 0.1%{?dist}.rc0.1
+Release: 0.1%{?dist}.rc0.2
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -106,8 +106,9 @@ Header and Library files for doing development with Network Security Services.
%patch2 -p0 -b .prelink
# FIXME uncomment these when we are ready
# to resume testing of part of the build
-#%patch4 -p0 -b .crypto
-#%patch5 -p0 -b .temporary
+%patch4 -p0 -b .crypto
+%patch5 -p0 -b .temporary
+# patch 5 won't be needed after a while
#rm -rf ./mozilla/security/nss/lib/util
@@ -149,6 +150,8 @@ export NSPR_LIB_DIR
# The -I$NSSUTIL_INCLUDE_DIR appears first in list and the sytem headers
# get selected instead of the ones in the tree. We can use gcc's -iquote
# as CFLAGS += -iquote${NSSUTIL_INCLUDE_DIR_LAST} and have it included last
+# We are prtially bootstrapped so have them both for now
+export NSSUTIL_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
export NSSUTIL_INCLUDE_DIR_LAST=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
export NSSUTIL_LIB_DIR=%{_libdir}
@@ -243,9 +246,9 @@ cd ./mozilla/security/nss/tests/
%global nss_ssl_tests " "
%global nss_ssl_run " "
-# FIXME uncomment thse when we are ready
-# to resume testing of part of the build
-#HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
+# FIXME uncomment these when we are ready to resume testing of part of the build
+# We can run the tests now
+HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
cd ../../../../
@@ -417,6 +420,10 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/utilrename.h
%{_includedir}/nss3/shsign.h
%changelog
+* Sun Oct 09 2011 Elio Maldonado <emaldona at redhat.com> - 3.13-0.1.rc0.2
+- Update to NSS_3_13_RC0 bootstrapping the system phase 2
+- Reenable the cipher test suite
+
* Sat Oct 08 2011 Elio Maldonado <emaldona at redhat.com> - 3.13-0.rc0.1
- Update to NSS_3_13_RC0
diff --git a/nss-split-softokn.sh b/nss-split-softokn.sh
index 0fcd7b3..1dbcfac 100644
--- a/nss-split-softokn.sh
+++ b/nss-split-softokn.sh
@@ -37,58 +37,57 @@ softokn_dir=${name}-softokn-${version}
# mozilla/security/nss/lib/softoken --- full directory
#-------------------------------------------------------
-SOFTOKN_WORK=${softokn_dir}-work
-rm -rf ${SOFTOKN_WORK}
-mkdir ${SOFTOKN_WORK}
+WORK_DIR=work
+rm -rf ${WORK_DIR}
+mkdir ${WORK_DIR}
# copy everything
-cp -a ${nss_source_dir} ${SOFTOKN_WORK}/${softokn_dir}
+cp -a ${nss_source_dir} ${WORK_DIR}/${softokn_dir}
# remove subdirectories that we don't want
-rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
-rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests
-rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
-rm -rf ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/pkg
+rm -rf ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/cmd
+rm -rf ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/tests
+rm -rf ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/lib
+rm -rf ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/pkg
# start with an empty lib directory and copy only what we need
-mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
+mkdir ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/lib
# copy entire freebl and softoken directories recursively
-cp -a ${nss_source_dir}/mozilla/security/nss/lib/freebl ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/freebl
-cp -a ${nss_source_dir}/mozilla/security/nss/lib/softoken ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/softoken
+cp -a ${nss_source_dir}/mozilla/security/nss/lib/freebl ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/lib/freebl
+cp -a ${nss_source_dir}/mozilla/security/nss/lib/softoken ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/lib/softoken
# Copy util because some headers have changed, won't be needed in next update
-cp -a ${nss_source_dir}/mozilla/security/nss/lib/util ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib/util
+cp -a ${nss_source_dir}/mozilla/security/nss/lib/util ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/lib/util
# and some Makefiles and related files
-cp ${nss_source_dir}/mozilla/security/nss/Makefile ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss
-cp ${nss_source_dir}/mozilla/security/nss/manifest.mn ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss
-cp ${nss_source_dir}/mozilla/security/nss/trademarks.txt ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss
-cp ${nss_source_dir}/mozilla/security/nss/lib/Makefile ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
-cp ${nss_source_dir}/mozilla/security/nss/lib/manifest.mn ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/lib
+cp ${nss_source_dir}/mozilla/security/nss/Makefile ${WORK_DIR}/${softokn_dir}/mozilla/security/nss
+cp ${nss_source_dir}/mozilla/security/nss/manifest.mn ${WORK_DIR}/${softokn_dir}/mozilla/security/nss
+cp ${nss_source_dir}/mozilla/security/nss/trademarks.txt ${WORK_DIR}/${softokn_dir}/mozilla/security/nss
+cp ${nss_source_dir}/mozilla/security/nss/lib/Makefile ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/lib
+cp ${nss_source_dir}/mozilla/security/nss/lib/manifest.mn ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/lib
# we do need shlibsign from cmd and other things
-mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
+mkdir ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/cmd
# copy some files at the top and selected subdirectories
-cp -p ${nss_source_dir}/mozilla/security/nss/cmd/Makefile ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
-cp -p ${nss_source_dir}/mozilla/security/nss/cmd/manifest.mn ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
-cp -p ${nss_source_dir}/mozilla/security/nss/cmd/platlibs.mk ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
-cp -p ${nss_source_dir}/mozilla/security/nss/cmd/platrules.mk ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
+cp -p ${nss_source_dir}/mozilla/security/nss/cmd/Makefile ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/cmd
+cp -p ${nss_source_dir}/mozilla/security/nss/cmd/manifest.mn ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/cmd
+cp -p ${nss_source_dir}/mozilla/security/nss/cmd/platlibs.mk ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/cmd
+cp -p ${nss_source_dir}/mozilla/security/nss/cmd/platrules.mk ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/cmd
-cp -a ${nss_source_dir}/mozilla/security/nss/cmd/shlibsign ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd/shlibsign
+cp -a ${nss_source_dir}/mozilla/security/nss/cmd/shlibsign ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/cmd/shlibsign
#
# copy the bltest, fipstests, lib, and subdirectories for testing
#for d in "bltest fipstest lib shlibsign"; do
src=${nss_source_dir}/mozilla/security/nss/cmd
-dst=${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/cmd
-
+dst=${WORK_DIR}/${softokn_dir}/mozilla/security/nss/cmd
# uncomment this line when we are to resume testing as part of the build
-#ts="bltest fipstest lib"
-ts=""
+# for bootstrapping make it ts=" " so they don't get copied
+ts="bltest fipstest lib"
for t in $ts; do
- p -a ${src}/$t ${sst}/$t
+ cp -a ${src}/$t ${dst}/$t
done
# we also need some test scripts and dtest data from tests
-mkdir ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests
+mkdir ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/tests
# copy the files at the top
fs="all.sh clean_tbx core_watch dll_version.sh header jssdir \
@@ -98,23 +97,23 @@ platformlist.tbx qaclean qa_stage qa_stat \
README.txt run_niscc.sh set_environment"
for f in $fs; do
cp -p ${nss_source_dir}/mozilla/security/nss/tests/$f \
- ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests
+ ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/tests
done
# copy the subdirectories that we need
cp -a ${nss_source_dir}/mozilla/security/nss/tests/common \
- ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests
+ ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/tests
cp -a ${nss_source_dir}/mozilla/security/nss/tests/cipher \
- ${SOFTOKN_WORK}/${softokn_dir}/mozilla/security/nss/tests
+ ${WORK_DIR}/${softokn_dir}/mozilla/security/nss/tests
-pushd ${SOFTOKN_WORK}
+pushd ${WORK_DIR}
# the compressed tar ball for nss-softokn
tar -cjf ../${name}-softokn-${version}-stripped.tar.bz2 ${softokn_dir}
popd
# cleanup after ourselves
-rm -fr ${nss_source_dir}
-rm -rf ${SOFTOKN_WORK}
+#rm -fr ${nss_source_dir}
+#rm -rf ${WORK_DIR}
diff --git a/softoken-minimal-test-dependencies.patch b/softoken-minimal-test-dependencies.patch
index b7bd3e6..bb6dbe0 100644
--- a/softoken-minimal-test-dependencies.patch
+++ b/softoken-minimal-test-dependencies.patch
@@ -1,6 +1,6 @@
diff -up mozilla/security/nss/cmd/lib/manifest.mn.crypto mozilla/security/nss/cmd/lib/manifest.mn
--- mozilla/security/nss/cmd/lib/manifest.mn.crypto 2011-09-16 12:16:50.000000000 -0700
-+++ mozilla/security/nss/cmd/lib/manifest.mn 2011-10-07 21:26:36.015938933 -0700
++++ mozilla/security/nss/cmd/lib/manifest.mn 2011-10-09 18:01:45.297861283 -0700
@@ -48,11 +48,6 @@ PRIVATE_EXPORTS = secutil.h \
$(NULL)
@@ -15,17 +15,19 @@ diff -up mozilla/security/nss/cmd/lib/manifest.mn.crypto mozilla/security/nss/cm
diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/lib/secutil.c
--- mozilla/security/nss/cmd/lib/secutil.c.crypto 2011-09-16 12:16:50.000000000 -0700
-+++ mozilla/security/nss/cmd/lib/secutil.c 2011-10-07 21:31:05.678457483 -0700
-@@ -50,8 +50,6 @@
++++ mozilla/security/nss/cmd/lib/secutil.c 2011-10-09 18:01:45.299861311 -0700
+@@ -48,10 +48,7 @@
+ #include "prenv.h"
+ #include "prnetdb.h"
- #include "cryptohi.h"
+-#include "cryptohi.h"
#include "secutil.h"
-#include "secpkcs7.h"
-#include "secpkcs5.h"
#include <stdarg.h>
#if !defined(_WIN32_WCE)
#include <sys/stat.h>
-@@ -62,37 +60,20 @@
+@@ -62,29 +59,9 @@
#include <unistd.h>
#endif
@@ -37,7 +39,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
-/* #include "secmod.h" */
-#include "pk11func.h"
#include "secoid.h"
--
+
-static char consoleName[] = {
-#ifdef XP_UNIX
- "/dev/tty"
@@ -49,16 +51,14 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
-#endif
-#endif
-};
-+#include "secoidt.h"
-
- #include "nssutil.h"
+-
+-#include "nssutil.h"
-#include "ssl.h"
++extern long DER_GetInteger(SECItem *src);
-+void
-+SECU_Indent(FILE *out, int level);
void
- SECU_PrintErrMsg(FILE *out, int level, char *progName, char *msg, ...)
+@@ -92,7 +69,7 @@ SECU_PrintErrMsg(FILE *out, int level, c
{
va_list args;
PRErrorCode err = PORT_GetError();
@@ -67,7 +67,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
va_start(args, msg);
-@@ -112,7 +93,7 @@ SECU_PrintError(char *progName, char *ms
+@@ -112,7 +89,7 @@ SECU_PrintError(char *progName, char *ms
{
va_list args;
PRErrorCode err = PORT_GetError();
@@ -76,19 +76,10 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
va_start(args, msg);
-@@ -142,445 +123,6 @@ SECU_PrintSystemError(char *progName, ch
- va_end(args);
+@@ -151,436 +128,6 @@ secu_ClearPassword(char *p)
+ }
}
--static void
--secu_ClearPassword(char *p)
--{
-- if (p) {
-- PORT_Memset(p, 0, PORT_Strlen(p));
-- PORT_Free(p);
-- }
--}
--
-char *
-SECU_GetPasswordString(void *arg, char *prompt)
-{
@@ -522,7 +513,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
SECStatus
secu_StdinToItem(SECItem *dst)
-@@ -703,64 +245,6 @@ loser:
+@@ -703,64 +250,6 @@ loser:
return SECFailure;
}
@@ -587,19 +578,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
#define INDENT_MULT 4
void
-@@ -931,6 +415,11 @@ SECU_StripTagAndLength(SECItem *i)
- return SECSuccess;
- }
-
-+/* Revert #define DER_GetInteger DER_GetInteger_Util */
-+#ifdef DER_GetInteger
-+#define DER_GetInteger_Util DER_GetInteger
-+extern long DER_GetInteger(SECItem *src);
-+#endif
-
- /* This expents i->data[0] to be the MSB of the integer.
- ** if you want to print a DER-encoded integer (with the tag and length)
-@@ -975,2493 +464,63 @@ SECU_PrintInteger(FILE *out, SECItem *i,
+@@ -975,2504 +464,74 @@ SECU_PrintInteger(FILE *out, SECItem *i,
}
static void
@@ -618,7 +597,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
- column = level*INDENT_MULT;
- }
- fprintf(out, "\""); column++;
--
+
- for (i = 0; i < si->len; i++) {
- unsigned char val = si->data[i];
- if (column > 76) {
@@ -628,7 +607,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
-
- fprintf(out,"%c", printable[val]); column++;
- }
-
+-
- fprintf(out, "\""); column++;
- if (column != level*INDENT_MULT || column > 76) {
- secu_Newline(out);
@@ -718,8 +697,9 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
- fprintf(out, "\n");
-
- PORT_Free(timeString);
--}
--
+ }
++#endif /* NSS_ENABLE_ECC */
+
-/*
- * Format and print the UTC Time "t". If the tag message "m" is not NULL,
- * do indent formatting based on "level" and add a newline afterward;
@@ -736,8 +716,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
- return;
-
- secu_PrintTime(out, time, m, level);
- }
-+#endif /* NSS_ENABLE_ECC */
+-}
-/*
- * Format and print the Generalized Time "t". If the tag message "m"
@@ -746,7 +725,10 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
- */
-void
-SECU_PrintGeneralizedTime(FILE *out, SECItem *t, char *m, int level)
--{
++SECStatus
++SECU_ParseCommandLine(int argc, char **argv, char *progName,
++ const secuCommand *cmd)
+ {
- int64 time;
- SECStatus rv;
-
@@ -754,9 +736,18 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
- rv = DER_GeneralizedTimeToTime(&time, t);
- if (rv != SECSuccess)
- return;
--
++ PRBool found;
++ PLOptState *optstate;
++ PLOptStatus status;
++ char *optstring;
++ PLLongOpt *longopts = NULL;
++ int i, j;
++ int lcmd = 0, lopt = 0;
+
- secu_PrintTime(out, time, m, level);
-}
++ PR_ASSERT(HasNoDuplicates(cmd->commands, cmd->numCommands));
++ PR_ASSERT(HasNoDuplicates(cmd->options, cmd->numOptions));
-/*
- * Format and print the UTC or Generalized Time "t". If the tag message
@@ -765,10 +756,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
- */
-void
-SECU_PrintTimeChoice(FILE *out, SECItem *t, char *m, int level)
-+SECStatus
-+SECU_ParseCommandLine(int argc, char **argv, char *progName,
-+ const secuCommand *cmd)
- {
+-{
- switch (t->type) {
- case siUTCTime:
- SECU_PrintUTCTime(out, t, m, level);
@@ -783,14 +771,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
- break;
- }
-}
-+ PRBool found;
-+ PLOptState *optstate;
-+ PLOptStatus status;
-+ char *optstring;
-+ PLLongOpt *longopts = NULL;
-+ int i, j;
-+ int lcmd = 0, lopt = 0;
-
+-
-
-/* This prints a SET or SEQUENCE */
-void
@@ -3127,11 +3108,30 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
-
- PR_ASSERT(HasNoDuplicates(cmd->commands, cmd->numCommands));
- PR_ASSERT(HasNoDuplicates(cmd->options, cmd->numOptions));
-+ PR_ASSERT(HasNoDuplicates(cmd->commands, cmd->numCommands));
-+ PR_ASSERT(HasNoDuplicates(cmd->options, cmd->numOptions));
-
- optstring = (char *)PORT_Alloc(cmd->numCommands + 2*cmd->numOptions+1);
- if (optstring == NULL)
+-
+- optstring = (char *)PORT_Alloc(cmd->numCommands + 2*cmd->numOptions+1);
+- if (optstring == NULL)
+- return SECFailure;
+-
+- j = 0;
+- for (i=0; i<cmd->numCommands; i++) {
+- if (cmd->commands[i].flag) /* single character option ? */
+- optstring[j++] = cmd->commands[i].flag;
+- if (cmd->commands[i].longform)
+- lcmd++;
++ optstring = (char *)PORT_Alloc(cmd->numCommands + 2*cmd->numOptions+1);
++ if (optstring == NULL)
++ return SECFailure;
++
++ j = 0;
++ for (i=0; i<cmd->numCommands; i++) {
++ if (cmd->commands[i].flag) /* single character option ? */
++ optstring[j++] = cmd->commands[i].flag;
++ if (cmd->commands[i].longform)
++ lcmd++;
+ }
+ for (i=0; i<cmd->numOptions; i++) {
+ if (cmd->options[i].flag) {
@@ -3611,144 +670,6 @@ SECU_PrintPRandOSError(char *progName)
}
@@ -3277,11 +3277,10 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
SECOidTag
SECU_StringToSignatureAlgTag(const char *alg)
{
-@@ -3774,299 +695,6 @@ SECU_StringToSignatureAlgTag(const char
- return hashAlgTag;
+@@ -3775,298 +696,6 @@ SECU_StringToSignatureAlgTag(const char
}
--
+
-SECStatus
-SECU_StoreCRL(PK11SlotInfo *slot, SECItem *derCrl, PRFileDesc *outFile,
- PRBool ascii, char *url)
@@ -3577,7 +3576,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
/* Caller ensures that dst is at least item->len*2+1 bytes long */
void
SECU_SECItemToHex(const SECItem * item, char * dst)
-@@ -4130,39 +758,3 @@ SECU_SECItemHexStringToBinary(SECItem* s
+@@ -4130,39 +759,3 @@ SECU_SECItemHexStringToBinary(SECItem* s
return SECSuccess;
}
@@ -3619,21 +3618,20 @@ diff -up mozilla/security/nss/cmd/lib/secutil.c.crypto mozilla/security/nss/cmd/
-
diff -up mozilla/security/nss/cmd/lib/secutil.h.crypto mozilla/security/nss/cmd/lib/secutil.h
--- mozilla/security/nss/cmd/lib/secutil.h.crypto 2011-09-16 12:16:50.000000000 -0700
-+++ mozilla/security/nss/cmd/lib/secutil.h 2011-10-07 21:26:36.019938985 -0700
-@@ -38,118 +38,14 @@
++++ mozilla/security/nss/cmd/lib/secutil.h 2011-10-09 18:03:11.008090160 -0700
+@@ -38,7 +38,10 @@
#include "seccomon.h"
#include "secitem.h"
+#include "secoid.h"
+#include "secoidt.h"
#include "secport.h"
++#include "key.h"
#include "prerror.h"
#include "base64.h"
--#include "key.h"
--#include "secpkcs7.h"
--#include "secasn1.h"
--#include "secder.h"
-+/*#include "key.h"*/
+ #include "key.h"
+@@ -47,109 +50,6 @@
+ #include "secder.h"
#include <stdio.h>
-#define SEC_CT_PRIVATE_KEY "private-key"
@@ -3742,7 +3740,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.h.crypto mozilla/security/nss/cmd/
/*
** Should be called once during initialization to set the default
-@@ -159,14 +55,6 @@ extern char *SECU_DefaultSSLDir(void);
+@@ -159,14 +59,6 @@ extern char *SECU_DefaultSSLDir(void);
*/
extern char *SECU_ConfigDirectory(const char* base);
@@ -3757,7 +3755,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.h.crypto mozilla/security/nss/cmd/
/* print out an error message */
extern void SECU_PrintError(char *progName, char *msg, ...);
-@@ -174,99 +62,19 @@ extern void SECU_PrintError(char *progNa
+@@ -174,99 +66,22 @@ extern void SECU_PrintError(char *progNa
/* print out a system error message */
extern void SECU_PrintSystemError(char *progName, char *msg, ...);
@@ -3788,9 +3786,9 @@ diff -up mozilla/security/nss/cmd/lib/secutil.h.crypto mozilla/security/nss/cmd/
-extern SECStatus
-SECU_ReadDERFromFile(SECItem *der, PRFileDesc *inFile, PRBool ascii);
-
--/* Indent based on "level" */
--extern void SECU_Indent(FILE *out, int level);
--
+ /* Indent based on "level" */
+ extern void SECU_Indent(FILE *out, int level);
+
/* Print integer value and hex */
extern void SECU_PrintInteger(FILE *out, SECItem *i, char *m, int level);
@@ -3857,7 +3855,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.h.crypto mozilla/security/nss/cmd/
/* Dump contents of an RSA public key */
extern int SECU_PrintRSAPublicKey(FILE *out, SECItem *der, char *m, int level);
-@@ -282,52 +90,9 @@ extern int SECU_PrintPrivateKey(FILE *ou
+@@ -282,52 +97,9 @@ extern int SECU_PrintPrivateKey(FILE *ou
extern int SECU_PrintFingerprints(FILE *out, SECItem *derCert, char *m,
int level);
@@ -3910,7 +3908,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.h.crypto mozilla/security/nss/cmd/
extern void SECU_PrintPRandOSError(char *progName);
extern SECStatus SECU_RegisterDynamicOids(void);
-@@ -335,70 +100,6 @@ extern SECStatus SECU_RegisterDynamicOid
+@@ -335,70 +107,6 @@ extern SECStatus SECU_RegisterDynamicOid
/* Identifies hash algorithm tag by its string representation. */
extern SECOidTag SECU_StringToSignatureAlgTag(const char *alg);
@@ -3981,7 +3979,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.h.crypto mozilla/security/nss/cmd/
/* Caller ensures that dst is at least item->len*2+1 bytes long */
void
SECU_SECItemToHex(const SECItem * item, char * dst);
-@@ -452,13 +153,6 @@ void printflags(char *trusts, unsigned i
+@@ -452,13 +160,6 @@ void printflags(char *trusts, unsigned i
extern int ffs(unsigned int i);
#endif
@@ -3997,7 +3995,7 @@ diff -up mozilla/security/nss/cmd/lib/secutil.h.crypto mozilla/security/nss/cmd/
#endif /* _SEC_UTIL_H_ */
diff -up mozilla/security/nss/cmd/manifest.mn.crypto mozilla/security/nss/cmd/manifest.mn
--- mozilla/security/nss/cmd/manifest.mn.crypto 2010-12-06 09:22:48.000000000 -0800
-+++ mozilla/security/nss/cmd/manifest.mn 2011-10-07 21:26:36.020938998 -0700
++++ mozilla/security/nss/cmd/manifest.mn 2011-10-09 18:01:45.300861325 -0700
@@ -41,46 +41,8 @@ DEPTH = ../..
REQUIRES = nss nspr libdbm
@@ -4054,7 +4052,7 @@ diff -up mozilla/security/nss/cmd/manifest.mn.crypto mozilla/security/nss/cmd/ma
$(NULL)
diff -up mozilla/security/nss/cmd/platlibs.mk.crypto mozilla/security/nss/cmd/platlibs.mk
--- mozilla/security/nss/cmd/platlibs.mk.crypto 2010-06-11 17:58:33.000000000 -0700
-+++ mozilla/security/nss/cmd/platlibs.mk 2011-10-07 21:26:36.020938998 -0700
++++ mozilla/security/nss/cmd/platlibs.mk 2011-10-09 18:01:45.301861339 -0700
@@ -92,44 +92,13 @@ DEFINES += -DNSS_USE_STATIC_LIBS
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
@@ -4153,7 +4151,7 @@ diff -up mozilla/security/nss/cmd/platlibs.mk.crypto mozilla/security/nss/cmd/pl
-L$(NSPR_LIB_DIR) \
diff -up mozilla/security/nss/tests/all.sh.crypto mozilla/security/nss/tests/all.sh
--- mozilla/security/nss/tests/all.sh.crypto 2010-01-29 11:58:40.000000000 -0800
-+++ mozilla/security/nss/tests/all.sh 2011-10-07 21:26:36.021939011 -0700
++++ mozilla/security/nss/tests/all.sh 2011-10-09 18:01:45.301861339 -0700
@@ -303,18 +303,18 @@ run_cycles()
############################## main code ###############################
diff --git a/sources b/sources
index db35e3c..89d759d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e3ccff60f56943056a5538ae9d38a17 nss-softokn-3.13-stripped.tar.bz2
+d321185dfed4c3cbd2bea46d380d4db4 nss-softokn-3.13-stripped.tar.bz2
More information about the scm-commits
mailing list