Attachment 898508 Details for Bug 1099619 – changes to rebase nss-util to nss-3.16.1

[patch] changes to rebase nss-util to nss-3.16.1

bz1099619util.patch (text/plain), 9.52 KB, created by Elio Maldonado Batiz on 2014-05-22 23:17:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-05-22 23:17:12 UTC

Size: 9.52 KB

patch

obsolete

>diff --git a/.gitignore b/.gitignore
>index 561889f..dedf7d2 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1 @@
>-/nss-util-3.15.3.tar.bz2
>+/nss-util-3.16.1.tar.bz2
>diff --git a/bug-1019529-nssutil_ReadSecmodDB-leaks.patch b/bug-1019529-nssutil_ReadSecmodDB-leaks.patch
>deleted file mode 100644
>index 52bca34..0000000
>--- a/bug-1019529-nssutil_ReadSecmodDB-leaks.patch
>+++ /dev/null
>@@ -1,89 +0,0 @@
>-diff --git a/lib/util/utilmod.c b/lib/util/utilmod.c
>---- a/lib/util/utilmod.c
>-+++ b/lib/util/utilmod.c
>-@@ -90,25 +90,27 @@ nssutil_releaseSpecList(char **moduleSpe
>-     return SECSuccess;
>- }
>- 
>- #define SECMOD_STEP 10
>- static SECStatus
>- nssutil_growList(char ***pModuleList, int *useCount, int last)
>- {
>-     char **newModuleList;
>-+    int newUseCount;
>- 
>--    *useCount += SECMOD_STEP;
>-+    newUseCount = *useCount + SECMOD_STEP;
>-     newModuleList = (char **)PORT_Realloc(*pModuleList,
>--					  *useCount*sizeof(char *));
>-+					  newUseCount*sizeof(char *));
>-     if (newModuleList == NULL) {
>- 	return SECFailure;
>-     }
>-     PORT_Memset(&newModuleList[last],0, sizeof(char *)*SECMOD_STEP);
>-     *pModuleList = newModuleList;
>-+    *useCount = newUseCount;
>-     return SECSuccess;
>- }
>- 
>- static 
>- char *_NSSUTIL_GetOldSecmodName(const char *dbname,const char *filename)
>- {
>-     char *file = NULL;
>-     char *dirPath = PORT_Strdup(dbname);
>-@@ -176,17 +178,17 @@ nssutil_ReadSecmodDB(const char *appName
>-     int useCount = SECMOD_STEP;
>-     char line[MAX_LINE_LENGTH];
>-     PRBool internal = PR_FALSE;
>-     PRBool skipParams = PR_FALSE;
>-     char *moduleString = NULL;
>-     char *paramsValue=NULL;
>-     PRBool failed = PR_TRUE;
>- 
>--    moduleList = (char **) PORT_ZAlloc(useCount*sizeof(char **));
>-+    moduleList = (char **) PORT_ZAlloc(useCount*sizeof(char *));
>-     if (moduleList == NULL) return NULL;
>- 
>-     if (dbname == NULL) {
>- 	goto return_default;
>-     }
>- 
>-     /* do we really want to use streams here */
>-     fd = fopen(dbname, "r");
>-@@ -324,16 +326,17 @@ nssutil_ReadSecmodDB(const char *appName
>- 	    SECStatus rv;
>- 	    rv = nssutil_growList(&moduleList, &useCount,  moduleCount+1);
>- 	    if (rv != SECSuccess) {
>- 		goto loser;
>- 	    }
>- 	}
>- 
>- 	if (internal) {
>-+	    /* XXX should we free moduleList[0] first? */
>- 	    moduleList[0] = moduleString;
>- 	} else {
>- 	    moduleList[moduleCount] = moduleString;
>- 	    moduleCount++;
>- 	}
>- 	moduleString = NULL;
>- 	internal = PR_FALSE;
>- 	skipParams = PR_FALSE;
>-@@ -353,17 +356,17 @@ done:
>- 	if (!olddbname) {
>- 	    goto bail;
>- 	}
>- 
>- 	/* old one exists */
>- 	status = PR_Access(olddbname, PR_ACCESS_EXISTS);
>- 	if (status == PR_SUCCESS) {
>- 	    PR_smprintf_free(olddbname);
>--	    PORT_ZFree(moduleList, useCount*sizeof(char **));
>-+	    PORT_ZFree(moduleList, useCount*sizeof(char *));
>- 	    PORT_SetError(SEC_ERROR_LEGACY_DATABASE);
>- 	    return NULL;
>- 	}
>- 
>- bail:
>- 	if (olddbname) {
>- 	    PR_smprintf_free(olddbname);
>- 	}
>diff --git a/nss-util-ecc-list-3.15.3.patch b/nss-util-ecc-list-3.15.3.patch
>deleted file mode 100644
>index 288dbf2..0000000
>--- a/nss-util-ecc-list-3.15.3.patch
>+++ /dev/null
>@@ -1,16 +0,0 @@
>-diff -up ./nss/lib/util/utilmodt.h.ecc_list ./nss/lib/util/utilmodt.h
>---- ./nss/lib/util/utilmodt.h.ecc_list	2013-12-04 10:19:17.393804242 -0800
>-+++ ./nss/lib/util/utilmodt.h	2013-12-04 10:22:28.541804170 -0800
>-@@ -23,10 +23,11 @@
>- #define SECMOD_SSL_FLAG		0x00000800L
>- #define SECMOD_TLS_FLAG		0x00001000L
>- #define SECMOD_AES_FLAG 	0x00002000L
>--#define SECMOD_SHA256_FLAG	0x00004000L
>-+#define SECMOD_SHA256_FLAG	0x00004000L     /* also for SHA224 */
>- #define SECMOD_SHA512_FLAG	0x00008000L	/* also for SHA384 */
>- #define SECMOD_CAMELLIA_FLAG 	0x00010000L /* = PUBLIC_MECH_CAMELLIA_FLAG */
>- #define SECMOD_SEED_FLAG	0x00020000L
>-+#define SECMOD_ECC_FLAG		0x00040000L
>- /* reserved bit for future, do not use */
>- #define SECMOD_RESERVED_FLAG    0X08000000L
>- #define SECMOD_FRIENDLY_FLAG	0x10000000L
>diff --git a/nss-util.spec b/nss-util.spec
>index dd2b8c6..9285f58 100644
>--- a/nss-util.spec
>+++ b/nss-util.spec
>@@ -1,9 +1,9 @@
>-%global nspr_version 4.10.2
>+%global nspr_version 4.10.5
> 
> Summary:          Network Security Services Utilities Library
> Name:             nss-util
>-Version:          3.15.3
>-Release:          4%{?dist}
>+Version:          3.16.1
>+Release:          1%{?dist}
> License:          MPLv2.0
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -35,10 +35,6 @@ Patch1:           build-nss-util-only.patch
> Patch2:           add-relro-linker-option.patch
> Patch3:           p-disable-md5-590364-reversed.patch
> Patch5:           hasht-dont-include-prtypes.patch
>-Patch6:           p2-900067.patch
>-Patch7: nss-util-ecc-list-3.15.3.patch
>-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=900971
>-Patch8: bug-1019529-nssutil_ReadSecmodDB-leaks.patch
> 
> %description
> Utilities for Network Security Services and the Softoken module
>@@ -63,13 +59,6 @@ Header and library files for doing development with Network Security Services.
> %patch2 -p0 -b .relro
> %patch3 -p0 -b .md5okay
> %patch5 -p0 -b .prtypes
>-pushd nss
>-%patch6 -p1 -b .990631
>-popd
>-%patch7 -p0 -b .ecc_list
>-pushd nss
>-%patch8 -p1 -b .1019529
>-popd
> 
> 
> %build
>@@ -235,6 +224,10 @@ done
> %{_includedir}/nss3/templates/templates.c
> 
> %changelog
>+* Thu May 22 2014 Elio Maldonado <emaldona@redhat.com> - 3.15.3-6
>+- Update to nss-3.16.1
>+- Resolves: rhbz#1099619 - Rebase nss in RHEL 6.6 to NSS 3.16.1
>+
> * Mon Apr 21 2014 Elio Maldonado <emaldona@redhat.com> - 3.15.3-4
> - nssutil_growList and nssutil_ReadSecmodDB cleanup
> - Resolves: Bug 1019529 - New defect found in nss-util-3.14.0.0-2.el6
>diff --git a/p2-900067.patch b/p2-900067.patch
>deleted file mode 100644
>index 45335fd..0000000
>--- a/p2-900067.patch
>+++ /dev/null
>@@ -1,130 +0,0 @@
>-diff --git a/lib/util/utilmod.c b/lib/util/utilmod.c
>---- a/lib/util/utilmod.c
>-+++ b/lib/util/utilmod.c
>-@@ -132,28 +132,30 @@ char *_NSSUTIL_GetOldSecmodName(const ch
>-     return file;
>- }
>- 
>- static SECStatus nssutil_AddSecmodDB(const char *appName, 
>- 		   const char *filename, const char *dbname, 
>- 		   char *module, PRBool rw);
>- 
>- #ifdef XP_UNIX
>-+#include <sys/types.h>
>-+#include <sys/stat.h>
>- #include <unistd.h>
>- #endif
>- #include <fcntl.h>
>- 
>- /* same as fopen, except it doesn't use umask, but explicit */
>- FILE *
>--lfopen(const char *name, const char *mode, int flags)
>-+lfopen(const char *name, const char *mode, int flags, mode_t file_mode)
>- {
>-     int fd;
>-     FILE *file;
>- 
>--    fd = open(name, flags, 0600);
>-+    fd = open(name, flags, file_mode);
>-     if (fd < 0) {
>- 	return NULL;
>-     }
>-     file = fdopen(fd, mode);
>-     if (!file) {
>- 	close(fd);
>-     }
>-     /* file inherits fd */
>-@@ -436,16 +438,18 @@ nssutil_ReleaseSecmodDBData(const char *
>-  * Delete a module from the Data Base
>-  */
>- static SECStatus
>- nssutil_DeleteSecmodDB(const char *appName, 
>- 		      const char *filename, const char *dbname, 
>- 		      char *args, PRBool rw)
>- {
>-     /* SHDB_FIXME implement */
>-+    struct stat stat_existing;
>-+    mode_t file_mode;
>-     FILE *fd = NULL;
>-     FILE *fd2 = NULL;
>-     char line[MAX_LINE_LENGTH];
>-     char *dbname2 = NULL;
>-     char *block = NULL;
>-     char *name = NULL;
>-     char *lib = NULL;
>-     int name_len, lib_len;
>-@@ -461,20 +465,28 @@ nssutil_DeleteSecmodDB(const char *appNa
>- 	PORT_SetError(SEC_ERROR_READ_ONLY);
>- 	return SECFailure;
>-     }
>- 
>-     dbname2 = PORT_Strdup(dbname);
>-     if (dbname2 == NULL) goto loser;
>-     dbname2[strlen(dbname)-1]++;
>- 
>-+    /* get the permissions of the existing file, or use 0600 */
>-+    if (!stat(dbname, &stat_existing)) {
>-+	file_mode = stat_existing.st_mode;
>-+    } else {
>-+	file_mode = 0600;
>-+    }
>-+
>-     /* do we really want to use streams here */
>-     fd = fopen(dbname, "r");
>-     if (fd == NULL) goto loser;
>--    fd2 = lfopen(dbname2, "w+", O_CREAT|O_RDWR|O_TRUNC);
>-+
>-+    fd2 = lfopen(dbname2, "w+", O_CREAT|O_RDWR|O_TRUNC, file_mode);
>-     if (fd2 == NULL) goto loser;
>- 
>-     name = NSSUTIL_ArgGetParamValue("name",args);
>-     if (name) {
>- 	name_len = PORT_Strlen(name);
>-     }
>-     lib = NSSUTIL_ArgGetParamValue("library",args);
>-     if (lib) {
>-@@ -564,16 +576,18 @@ loser:
>- /*
>-  * Add a module to the Data base 
>-  */
>- static SECStatus
>- nssutil_AddSecmodDB(const char *appName, 
>- 		   const char *filename, const char *dbname, 
>- 		   char *module, PRBool rw)
>- {
>-+    struct stat stat_existing;
>-+    mode_t file_mode;
>-     FILE *fd = NULL;
>-     char *block = NULL;
>-     PRBool libFound = PR_FALSE;
>- 
>-     if (dbname == NULL) {
>- 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
>- 	return SECFailure;
>-     }
>-@@ -583,17 +597,24 @@ nssutil_AddSecmodDB(const char *appName,
>- 	PORT_SetError(SEC_ERROR_READ_ONLY);
>- 	return SECFailure;
>-     }
>- 
>-     /* remove the previous version if it exists */
>-     (void) nssutil_DeleteSecmodDB(appName, filename, 
>- 				  dbname, module, rw);
>- 
>--    fd = lfopen(dbname, "a+", O_CREAT|O_RDWR|O_APPEND);
>-+    /* get the permissions of the existing file, or use 0600 */
>-+    if (!stat(dbname, &stat_existing)) {
>-+	file_mode = stat_existing.st_mode;
>-+    } else {
>-+	file_mode = 0600;
>-+    }
>-+
>-+    fd = lfopen(dbname, "a+", O_CREAT|O_RDWR|O_APPEND, file_mode);
>-     if (fd == NULL) {
>- 	return SECFailure;
>-     }
>-     module = NSSUTIL_ArgStrip(module);
>-     while (*module) {
>- 	int count;
>- 	char *keyEnd = PORT_Strchr(module,'=');
>- 	char *value;
>diff --git a/sources b/sources
>index f732eaf..20eca83 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-c886c99c9df703d1d6725910ef1b2eef  nss-util-3.15.3.tar.bz2
>+e67f14fd1a73fce971d09c071d7cbee6  nss-util-3.16.1.tar.bz2

Flags:

rrelyea: review+

Actions: View | Diff

Attachments on bug 1099619: 898508 | 898509 | 898716 | 903189 | 913569 | 928882 | 928886 | 928887