diff options
| -rw-r--r-- | security/nss/lib/ssl/sslerrstrs.c | 6 | ||||
| -rw-r--r-- | security/nss/lib/ssl/sslerrstrs.h | 53 | ||||
| -rw-r--r-- | security/nss/lib/ssl/sslimpl.h | 4 | ||||
| -rw-r--r-- | security/nss/lib/ssl/sslinit.c | 7 | ||||
| -rw-r--r-- | security/nss/lib/ssl/sslsnce.c | 1 | ||||
| -rw-r--r-- | security/nss/lib/ssl/sslsock.c | 1 | ||||
| -rw-r--r-- | security/nss/lib/ssl/sslutil.h | 53 |
7 files changed, 11 insertions, 114 deletions
diff --git a/security/nss/lib/ssl/sslerrstrs.c b/security/nss/lib/ssl/sslerrstrs.c index 182a2bfd6..a06f99ed9 100644 --- a/security/nss/lib/ssl/sslerrstrs.c +++ b/security/nss/lib/ssl/sslerrstrs.c @@ -38,7 +38,6 @@ #include "prinit.h" #include "nssutil.h" #include "ssl.h" -#include "sslerrstrs.h" #define ER3(name, value, str) {#name, str}, @@ -59,8 +58,9 @@ ssl_InitializePRErrorTableOnce(void) { static PRCallOnceType once; -PRStatus +SECStatus ssl_InitializePRErrorTable(void) { - return PR_CallOnce(&once, ssl_InitializePRErrorTableOnce); + return (PR_SUCCESS == PR_CallOnce(&once, ssl_InitializePRErrorTableOnce)) + ? SECSuccess : SECFailure; } diff --git a/security/nss/lib/ssl/sslerrstrs.h b/security/nss/lib/ssl/sslerrstrs.h deleted file mode 100644 index a254cb5e8..000000000 --- a/security/nss/lib/ssl/sslerrstrs.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file contains prototypes for the public SSL functions. - * - * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1994-2000 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -/* $Id$ */ - -#ifndef __sslerrstrs_h_ -#define __sslerrstrs_h_ - -#include "prtypes.h" - -SEC_BEGIN_PROTOS - -extern PRStatus -ssl_InitializePRErrorTable(void); - -SEC_END_PROTOS - -#endif /* __sslerrstrs_h_ */ diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h index 271a8660a..8f0a69b39 100644 --- a/security/nss/lib/ssl/sslimpl.h +++ b/security/nss/lib/ssl/sslimpl.h @@ -1151,6 +1151,10 @@ extern sslSessionIDUncacheFunc ssl_sid_uncache; SEC_BEGIN_PROTOS +/* Internal initialization and installation of the SSL error tables */ +extern SECStatus ssl_Init(void); +extern SECStatus ssl_InitializePRErrorTable(void); + /* Implementation of ops for default (non socks, non secure) case */ extern int ssl_DefConnect(sslSocket *ss, const PRNetAddr *addr); extern PRFileDesc *ssl_DefAccept(sslSocket *ss, PRNetAddr *addr); diff --git a/security/nss/lib/ssl/sslinit.c b/security/nss/lib/ssl/sslinit.c index d405f70c3..b7a4f4ea5 100644 --- a/security/nss/lib/ssl/sslinit.c +++ b/security/nss/lib/ssl/sslinit.c @@ -43,7 +43,7 @@ #include "seccomon.h" #include "secerr.h" #include "ssl.h" -#include "sslerrstrs.h" +#include "sslimpl.h" static int ssl_inited = 0; @@ -51,8 +51,9 @@ SECStatus ssl_Init(void) { if (!ssl_inited) { - if (ssl_InitializePRErrorTable() == PR_FAILURE) { - return (SEC_ERROR_NO_MEMORY); + if (ssl_InitializePRErrorTable() != SECSuccess) { + PORT_SetError(SEC_ERROR_NO_MEMORY); + return (SECFailure); } ssl_inited = 1; } diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c index f0440d903..673283890 100644 --- a/security/nss/lib/ssl/sslsnce.c +++ b/security/nss/lib/ssl/sslsnce.c @@ -83,7 +83,6 @@ #include "ssl.h" #include "sslimpl.h" #include "sslproto.h" -#include "sslutil.h" #include "pk11func.h" #include "base64.h" #include "keyhi.h" diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c index d5ec516ee..98c65c105 100644 --- a/security/nss/lib/ssl/sslsock.c +++ b/security/nss/lib/ssl/sslsock.c @@ -47,7 +47,6 @@ #include "ssl.h" #include "sslimpl.h" #include "sslproto.h" -#include "sslutil.h" #include "nspr.h" #include "private/pprio.h" #include "blapi.h" diff --git a/security/nss/lib/ssl/sslutil.h b/security/nss/lib/ssl/sslutil.h deleted file mode 100644 index 7ddb91413..000000000 --- a/security/nss/lib/ssl/sslutil.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file contains prototypes for the public SSL functions. - * - * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1994-2000 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ -/* $Id$ */ - -#ifndef __sslutil_h_ -#define __sslutil_h_ - -#include "prtypes.h" - -SEC_BEGIN_PROTOS - -extern PRStatus SSL_InitializePRErrorTable(void); -extern SECStatus ssl_Init(void); - -SEC_END_PROTOS - -#endif /* __sslutil_h_ */ |