diff options
Diffstat (limited to 'xmlsecurity/source/xmlsec/nss/certerrors.h')
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/certerrors.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/certerrors.h b/xmlsecurity/source/xmlsec/nss/certerrors.h index 9b9801f21f59..d91fff52923d 100644 --- a/xmlsecurity/source/xmlsec/nss/certerrors.h +++ b/xmlsecurity/source/xmlsec/nss/certerrors.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,9 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: securityenvironment_nssimpl.cxx,v $ - * $Revision: 1.23 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -28,7 +26,6 @@ * ************************************************************************/ - {SEC_ERROR_IO, "An I/O error occurred during security authorization."}, {SEC_ERROR_LIBRARY_FAILURE, "security library failure."}, @@ -370,7 +367,12 @@ an existing cert, but that is not the same cert."}, {SEC_ERROR_BAD_INFO_ACCESS_LOCATION, "Bad information access location in cert extension"}, -{SEC_ERROR_LIBPKIX_INTERNAL, "Libpkix internal error occured during cert validation."}, +{SEC_ERROR_LIBPKIX_INTERNAL, "Libpkix internal error occurred during cert validation."}, + +#if ( NSS_VMAJOR > 3 ) || ( NSS_VMAJOR == 3 && NSS_VMINOR > 12 ) || ( NSS_VMAJOR == 3 && NSS_VMINOR == 12 && NSS_VPATCH > 2 ) +// following 3 errors got first used in NSS 3.12.3 +// they were in the header even in 3.12.2 but there was missing the mapping in pk11err.c +// see also https://bugzilla.mozilla.org/show_bug.cgi?id=453364 {SEC_ERROR_PKCS11_GENERAL_ERROR, "A PKCS #11 module returned CKR_GENERAL_ERROR, indicating that an unrecoverable error has occurred."}, @@ -378,7 +380,15 @@ an existing cert, but that is not the same cert."}, {SEC_ERROR_PKCS11_DEVICE_ERROR, "A PKCS #11 module returned CKR_DEVICE_ERROR, indicating that a problem has occurred with the token or slot."}, +#endif + +#if ( NSS_VMAJOR > 3 ) || ( NSS_VMAJOR == 3 && NSS_VMINOR > 12 ) || ( NSS_VMAJOR == 3 && NSS_VMINOR == 12 && NSS_VPATCH > 3 ) +// following 2 errors got added in NSS 3.12.4 + {SEC_ERROR_BAD_INFO_ACCESS_METHOD, "Unknown information access method in certificate extension."}, {SEC_ERROR_CRL_IMPORT_FAILED, "Error attempting to import a CRL."}, +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |