Attachment 888122 Details for Bug 689919 – deals with using older version of nss-softokn

[patch] deals with using older version of nss-softokn

define-uint32.patch (text/plain), 2.60 KB, created by Elio Maldonado Batiz on 2014-04-21 15:45:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-04-21 15:45:20 UTC

Size: 2.60 KB

patch

obsolete

>diff -up ./nss/cmd/chktest/chktest.c.uint32 ./nss/cmd/chktest/chktest.c
>--- ./nss/cmd/chktest/chktest.c.uint32	2013-11-09 09:23:30.000000000 -0800
>+++ ./nss/cmd/chktest/chktest.c	2014-04-18 09:39:14.482703516 -0700
>@@ -5,6 +5,10 @@
> #include <stdio.h>
> #include <stdlib.h>
> 
>+#ifndef uint32
>+#define uint32 PRUint32
>+#endif
>+
> #include "blapi.h"
> #include "secutil.h"
> 
>diff -up ./nss/cmd/rsaperf/rsaperf.c.uint32 ./nss/cmd/rsaperf/rsaperf.c
>--- ./nss/cmd/rsaperf/rsaperf.c.uint32	2013-11-09 09:23:30.000000000 -0800
>+++ ./nss/cmd/rsaperf/rsaperf.c	2014-04-18 09:39:14.483703529 -0700
>@@ -7,6 +7,11 @@
> #include "secutil.h"
> #include "nspr.h"
> #include "nss.h"
>+
>+#ifndef uint32
>+#define uint32 PRUint32
>+#endif
>+
> #include "blapi.h"
> #include "plgetopt.h"
> #include "lowkeyi.h"
>diff -up ./nss/cmd/signtool/certgen.c.uint32 ./nss/cmd/signtool/certgen.c
>--- ./nss/cmd/signtool/certgen.c.uint32	2013-11-09 09:23:30.000000000 -0800
>+++ ./nss/cmd/signtool/certgen.c	2014-04-18 09:39:14.483703529 -0700
>@@ -2,6 +2,10 @@
>  * 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/. */
> 
>+#ifndef uint32
>+#define uint32 PRUint32
>+#endif
>+
> #include "signtool.h"
> 
> #include "secoid.h"
>diff -up ./nss/cmd/signtool/sign.c.uint32 ./nss/cmd/signtool/sign.c
>--- ./nss/cmd/signtool/sign.c.uint32	2013-11-09 09:23:30.000000000 -0800
>+++ ./nss/cmd/signtool/sign.c	2014-04-18 09:39:14.484703542 -0700
>@@ -2,6 +2,10 @@
>  * 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/. */
> 
>+#ifndef uint32
>+#define uint32 PRUint32
>+#endif
>+
> #include "signtool.h"
> #include "zip.h" 
> #include "prmem.h"
>diff -up ./nss/lib/ckfw/pem/ckpem.h.uint32 ./nss/lib/ckfw/pem/ckpem.h
>--- ./nss/lib/ckfw/pem/ckpem.h.uint32	2014-04-18 09:39:14.468703337 -0700
>+++ ./nss/lib/ckfw/pem/ckpem.h	2014-04-18 09:43:05.526751931 -0700
>@@ -9,6 +9,11 @@
> #include "secoid.h"
> #include "secasn1.h"
> #include "blapit.h"
>+
>+#ifndef uint32
>+#define uint32 PRUint32
>+#endif
>+
> #include "softoken.h"
> 
> /*
>diff -up ./nss/lib/cryptohi/sechash.c.uint32 ./nss/lib/cryptohi/sechash.c
>--- ./nss/lib/cryptohi/sechash.c.uint32	2013-11-09 09:23:30.000000000 -0800
>+++ ./nss/lib/cryptohi/sechash.c	2014-04-18 09:39:14.484703542 -0700
>@@ -1,6 +1,11 @@
> /* 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/. */
>+
>+#ifndef uint32
>+#define uint32 PRUint32
>+#endif
>+
> #include "sechash.h"
> #include "secoidt.h"
> #include "secerr.h"

Actions: View | Diff

Attachments on bug 689919: 520484 | 520485 | 520486 | 520488 | 520489 | 888122 | 888123 | 907311