summaryrefslogtreecommitdiff
path: root/security/nss
diff options
context:
space:
mode:
authorrelyea%netscape.com <devnull@localhost>2003-10-17 17:56:56 +0000
committerrelyea%netscape.com <devnull@localhost>2003-10-17 17:56:56 +0000
commit1fc18b2c54897374813560551d7f3ce3c6ad5134 (patch)
treef2814a3069efa637278270c345908472c986e6e5 /security/nss
parent6b9f75b91bb6372d7ce4c8d5f8eb1fe3e80ee090 (diff)
downloadnss-hg-1fc18b2c54897374813560551d7f3ce3c6ad5134.tar.gz
Incorporate WTC's review comments..
Diffstat (limited to 'security/nss')
-rw-r--r--security/nss/lib/nss/nss.def6
-rw-r--r--security/nss/lib/pkcs7/p7decode.c3
-rw-r--r--security/nss/lib/pkcs7/p7encode.c3
-rw-r--r--security/nss/lib/util/secasn1.h4
-rw-r--r--security/nss/lib/util/secasn1d.c3
-rw-r--r--security/nss/lib/util/secasn1e.c3
6 files changed, 7 insertions, 15 deletions
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 3531fe634..b871e1cbf 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -767,12 +767,12 @@ NSS_Get_CERT_TimeChoiceTemplate;
PK11_ExportEncryptedPrivKeyInfo;
PK11_FindSlotsByAliases;
PK11_PubDeriveExtended;
-SECKEY_ECParams2KeySize;
-SECMOD_GetDBModuleList;
-SECMOD_GetDeadModuleList;
SEC_ASN1DecoderAbort;
SEC_ASN1EncoderAbort;
SEC_DupCrl;
+SECKEY_ECParams2KeySize;
+SECMOD_GetDBModuleList;
+SECMOD_GetDeadModuleList;
;+ local:
;+ *;
;+};
diff --git a/security/nss/lib/pkcs7/p7decode.c b/security/nss/lib/pkcs7/p7decode.c
index 6bf8307fc..447502176 100644
--- a/security/nss/lib/pkcs7/p7decode.c
+++ b/security/nss/lib/pkcs7/p7decode.c
@@ -1256,9 +1256,6 @@ void
SEC_PKCS7DecoderAbort(SEC_PKCS7DecoderContext *p7dcx, int error)
{
PORT_Assert(p7dcx);
- if (!p7dcx) {
- return;
- }
SEC_ASN1DecoderAbort(p7dcx->dcx, error);
}
diff --git a/security/nss/lib/pkcs7/p7encode.c b/security/nss/lib/pkcs7/p7encode.c
index 04fc2621d..39be62117 100644
--- a/security/nss/lib/pkcs7/p7encode.c
+++ b/security/nss/lib/pkcs7/p7encode.c
@@ -1172,9 +1172,6 @@ void
SEC_PKCS7EncoderAbort(SEC_PKCS7EncoderContext *p7ecx, int error)
{
PORT_Assert(p7ecx);
- if (!p7ecx) {
- return;
- }
SEC_ASN1EncoderAbort(p7ecx->ecx, error);
}
diff --git a/security/nss/lib/util/secasn1.h b/security/nss/lib/util/secasn1.h
index 6858fc89b..4adaac408 100644
--- a/security/nss/lib/util/secasn1.h
+++ b/security/nss/lib/util/secasn1.h
@@ -69,6 +69,8 @@ extern SECStatus SEC_ASN1DecoderUpdate(SEC_ASN1DecoderContext *cx,
unsigned long len);
extern SECStatus SEC_ASN1DecoderFinish(SEC_ASN1DecoderContext *cx);
+
+/* Higher level code detected an error, abort the rest of the processing */
extern void SEC_ASN1DecoderAbort(SEC_ASN1DecoderContext *cx, int error);
extern void SEC_ASN1DecoderSetFilterProc(SEC_ASN1DecoderContext *cx,
@@ -110,6 +112,8 @@ extern SECStatus SEC_ASN1EncoderUpdate(SEC_ASN1EncoderContext *cx,
unsigned long len);
extern void SEC_ASN1EncoderFinish(SEC_ASN1EncoderContext *cx);
+
+/* Higher level code detected an error, abort the rest of the processing */
extern void SEC_ASN1EncoderAbort(SEC_ASN1EncoderContext *cx, int error);
extern void SEC_ASN1EncoderSetNotifyProc(SEC_ASN1EncoderContext *cx,
diff --git a/security/nss/lib/util/secasn1d.c b/security/nss/lib/util/secasn1d.c
index bba31c2d9..5f2116d54 100644
--- a/security/nss/lib/util/secasn1d.c
+++ b/security/nss/lib/util/secasn1d.c
@@ -2849,9 +2849,6 @@ void
SEC_ASN1DecoderAbort(SEC_ASN1DecoderContext *cx, int error)
{
PORT_Assert(cx);
- if (!cx) {
- return;
- }
PORT_SetError(error);
cx->status = decodeError;
}
diff --git a/security/nss/lib/util/secasn1e.c b/security/nss/lib/util/secasn1e.c
index 3d954d228..4a82f4857 100644
--- a/security/nss/lib/util/secasn1e.c
+++ b/security/nss/lib/util/secasn1e.c
@@ -1329,9 +1329,6 @@ void
SEC_ASN1EncoderAbort(SEC_ASN1EncoderContext *cx, int error)
{
PORT_Assert(cx);
- if (!cx) {
- return;
- }
PORT_SetError(error);
cx->status = encodeError;
}