diff options
Diffstat (limited to 'nss/lib/libpkix/pkix_pl_nss')
| -rw-r--r-- | nss/lib/libpkix/pkix_pl_nss/module/exports.gyp | 36 | ||||
| -rw-r--r-- | nss/lib/libpkix/pkix_pl_nss/module/module.gyp | 41 | ||||
| -rw-r--r-- | nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c | 2 | ||||
| -rwxr-xr-x | nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c | 6 | ||||
| -rw-r--r-- | nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c | 2 | ||||
| -rw-r--r-- | nss/lib/libpkix/pkix_pl_nss/pki/exports.gyp | 41 | ||||
| -rw-r--r-- | nss/lib/libpkix/pkix_pl_nss/pki/pki.gyp | 39 | ||||
| -rw-r--r-- | nss/lib/libpkix/pkix_pl_nss/system/exports.gyp | 37 | ||||
| -rwxr-xr-x | nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c | 4 | ||||
| -rw-r--r-- | nss/lib/libpkix/pkix_pl_nss/system/system.gyp | 36 |
10 files changed, 237 insertions, 7 deletions
diff --git a/nss/lib/libpkix/pkix_pl_nss/module/exports.gyp b/nss/lib/libpkix/pkix_pl_nss/module/exports.gyp new file mode 100644 index 0000000..064a17c --- /dev/null +++ b/nss/lib/libpkix/pkix_pl_nss/module/exports.gyp @@ -0,0 +1,36 @@ +# 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/. +{ + 'includes': [ + '../../../../coreconf/config.gypi' + ], + 'targets': [ + { + 'target_name': 'lib_libpkix_pkix_pl_nss_module_exports', + 'type': 'none', + 'copies': [ + { + 'files': [ + 'pkix_pl_aiamgr.h', + 'pkix_pl_colcertstore.h', + 'pkix_pl_httpcertstore.h', + 'pkix_pl_httpdefaultclient.h', + 'pkix_pl_ldapcertstore.h', + 'pkix_pl_ldapdefaultclient.h', + 'pkix_pl_ldaprequest.h', + 'pkix_pl_ldapresponse.h', + 'pkix_pl_ldapt.h', + 'pkix_pl_nsscontext.h', + 'pkix_pl_pk11certstore.h', + 'pkix_pl_socket.h' + ], + 'destination': '<(nss_private_dist_dir)/<(module)' + } + ] + } + ], + 'variables': { + 'module': 'nss' + } +} diff --git a/nss/lib/libpkix/pkix_pl_nss/module/module.gyp b/nss/lib/libpkix/pkix_pl_nss/module/module.gyp new file mode 100644 index 0000000..8d7459d --- /dev/null +++ b/nss/lib/libpkix/pkix_pl_nss/module/module.gyp @@ -0,0 +1,41 @@ +# 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/. +{ + 'includes': [ + '../../../../coreconf/config.gypi' + ], + 'targets': [ + { + 'target_name': 'pkixmodule', + 'type': 'static_library', + 'sources': [ + 'pkix_pl_aiamgr.c', + 'pkix_pl_colcertstore.c', + 'pkix_pl_httpcertstore.c', + 'pkix_pl_httpdefaultclient.c', + 'pkix_pl_ldapcertstore.c', + 'pkix_pl_ldapdefaultclient.c', + 'pkix_pl_ldaprequest.c', + 'pkix_pl_ldapresponse.c', + 'pkix_pl_ldaptemplates.c', + 'pkix_pl_nsscontext.c', + 'pkix_pl_pk11certstore.c', + 'pkix_pl_socket.c' + ], + 'dependencies': [ + '<(DEPTH)/exports.gyp:nss_exports' + ] + } + ], + 'target_defaults': { + 'defines': [ + 'SHLIB_SUFFIX=\"<(dll_suffix)\"', + 'SHLIB_PREFIX=\"<(dll_prefix)\"', + 'SHLIB_VERSION=\"\"' + ] + }, + 'variables': { + 'module': 'nss' + } +}
\ No newline at end of file diff --git a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c index 148c2c1..d9f5662 100644 --- a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c +++ b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c @@ -366,7 +366,7 @@ pkix_pl_AIAMgr_GetHTTPCerts( cleanup: /* Session and request cleanup in case of error. Passing through without cleanup * if interrupted by blocked IO. */ - if (PKIX_ERROR_RECEIVED && aiaMgr) { + if (PKIX_ERROR_RECEIVED) { if (aiaMgr->client.hdata.requestSession != NULL) { (*hcv1->freeFcn)(aiaMgr->client.hdata.requestSession); aiaMgr->client.hdata.requestSession = NULL; diff --git a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c index 30aefb8..471f920 100755 --- a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c +++ b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c @@ -39,10 +39,10 @@ const SEC_ASN1Template SECOID_AlgorithmIDTemplate[] = { { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SECAlgorithmID) }, { SEC_ASN1_OBJECT_ID, - offsetof(SECAlgorithmID,algorithm), }, + offsetof(SECAlgorithmID,algorithm) }, { SEC_ASN1_OPTIONAL | SEC_ASN1_ANY, - offsetof(SECAlgorithmID,parameters), }, - { 0, } + offsetof(SECAlgorithmID,parameters) }, + { 0 } }; */ /* --Private-HttpCertStoreContext-Object Functions----------------------- */ diff --git a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c index 6bd0a3a..e869837 100644 --- a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c +++ b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c @@ -765,7 +765,7 @@ pkix_pl_Socket_RegisterSelf(void *plContext) #ifdef PKIX_SOCKETTRACE { char *val = NULL; - val = PR_GetEnv("SOCKETTRACE"); + val = PR_GetEnvSecure("SOCKETTRACE"); /* Is SOCKETTRACE set in the environment? */ if ((val != NULL) && (*val != '\0')) { socketTraceFlag = diff --git a/nss/lib/libpkix/pkix_pl_nss/pki/exports.gyp b/nss/lib/libpkix/pkix_pl_nss/pki/exports.gyp new file mode 100644 index 0000000..616f94f --- /dev/null +++ b/nss/lib/libpkix/pkix_pl_nss/pki/exports.gyp @@ -0,0 +1,41 @@ +# 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/. +{ + 'includes': [ + '../../../../coreconf/config.gypi' + ], + 'targets': [ + { + 'target_name': 'lib_libpkix_pkix_pl_nss_pki_exports', + 'type': 'none', + 'copies': [ + { + 'files': [ + 'pkix_pl_basicconstraints.h', + 'pkix_pl_cert.h', + 'pkix_pl_certpolicyinfo.h', + 'pkix_pl_certpolicymap.h', + 'pkix_pl_certpolicyqualifier.h', + 'pkix_pl_crl.h', + 'pkix_pl_crldp.h', + 'pkix_pl_crlentry.h', + 'pkix_pl_date.h', + 'pkix_pl_generalname.h', + 'pkix_pl_infoaccess.h', + 'pkix_pl_nameconstraints.h', + 'pkix_pl_ocspcertid.h', + 'pkix_pl_ocsprequest.h', + 'pkix_pl_ocspresponse.h', + 'pkix_pl_publickey.h', + 'pkix_pl_x500name.h' + ], + 'destination': '<(nss_private_dist_dir)/<(module)' + } + ] + } + ], + 'variables': { + 'module': 'nss' + } +} diff --git a/nss/lib/libpkix/pkix_pl_nss/pki/pki.gyp b/nss/lib/libpkix/pkix_pl_nss/pki/pki.gyp new file mode 100644 index 0000000..af7730c --- /dev/null +++ b/nss/lib/libpkix/pkix_pl_nss/pki/pki.gyp @@ -0,0 +1,39 @@ +# 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/. +{ + 'includes': [ + '../../../../coreconf/config.gypi' + ], + 'targets': [ + { + 'target_name': 'pkixpki', + 'type': 'static_library', + 'sources': [ + 'pkix_pl_basicconstraints.c', + 'pkix_pl_cert.c', + 'pkix_pl_certpolicyinfo.c', + 'pkix_pl_certpolicymap.c', + 'pkix_pl_certpolicyqualifier.c', + 'pkix_pl_crl.c', + 'pkix_pl_crldp.c', + 'pkix_pl_crlentry.c', + 'pkix_pl_date.c', + 'pkix_pl_generalname.c', + 'pkix_pl_infoaccess.c', + 'pkix_pl_nameconstraints.c', + 'pkix_pl_ocspcertid.c', + 'pkix_pl_ocsprequest.c', + 'pkix_pl_ocspresponse.c', + 'pkix_pl_publickey.c', + 'pkix_pl_x500name.c' + ], + 'dependencies': [ + '<(DEPTH)/exports.gyp:nss_exports' + ] + } + ], + 'variables': { + 'module': 'nss' + } +}
\ No newline at end of file diff --git a/nss/lib/libpkix/pkix_pl_nss/system/exports.gyp b/nss/lib/libpkix/pkix_pl_nss/system/exports.gyp new file mode 100644 index 0000000..a2f7594 --- /dev/null +++ b/nss/lib/libpkix/pkix_pl_nss/system/exports.gyp @@ -0,0 +1,37 @@ +# 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/. +{ + 'includes': [ + '../../../../coreconf/config.gypi' + ], + 'targets': [ + { + 'target_name': 'lib_libpkix_pkix_pl_nss_system_exports', + 'type': 'none', + 'copies': [ + { + 'files': [ + 'pkix_pl_bigint.h', + 'pkix_pl_bytearray.h', + 'pkix_pl_common.h', + 'pkix_pl_hashtable.h', + 'pkix_pl_lifecycle.h', + 'pkix_pl_mem.h', + 'pkix_pl_monitorlock.h', + 'pkix_pl_mutex.h', + 'pkix_pl_object.h', + 'pkix_pl_oid.h', + 'pkix_pl_primhash.h', + 'pkix_pl_rwlock.h', + 'pkix_pl_string.h' + ], + 'destination': '<(nss_private_dist_dir)/<(module)' + } + ] + } + ], + 'variables': { + 'module': 'nss' + } +} diff --git a/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c b/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c index 338eb1c..70ed25d 100755 --- a/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c +++ b/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c @@ -135,7 +135,7 @@ PKIX_PL_Initialize( return PKIX_ALLOC_ERROR(); } - if (PR_GetEnv("NSS_STRICT_SHUTDOWN")) { + if (PR_GetEnvSecure("NSS_STRICT_SHUTDOWN")) { pkixLog = PR_NewLogModule("pkix"); } /* @@ -262,7 +262,7 @@ PKIX_PL_Shutdown(void *plContext) #ifdef DEBUG numLeakedObjects = pkix_pl_lifecycle_ObjectLeakCheck(NULL); - if (PR_GetEnv("NSS_STRICT_SHUTDOWN")) { + if (PR_GetEnvSecure("NSS_STRICT_SHUTDOWN")) { PORT_Assert(numLeakedObjects == 0); } #else diff --git a/nss/lib/libpkix/pkix_pl_nss/system/system.gyp b/nss/lib/libpkix/pkix_pl_nss/system/system.gyp new file mode 100644 index 0000000..32daec9 --- /dev/null +++ b/nss/lib/libpkix/pkix_pl_nss/system/system.gyp @@ -0,0 +1,36 @@ +# 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/. +{ + 'includes': [ + '../../../../coreconf/config.gypi' + ], + 'targets': [ + { + 'target_name': 'pkixsystem', + 'type': 'static_library', + 'sources': [ + 'pkix_pl_bigint.c', + 'pkix_pl_bytearray.c', + 'pkix_pl_common.c', + 'pkix_pl_error.c', + 'pkix_pl_hashtable.c', + 'pkix_pl_lifecycle.c', + 'pkix_pl_mem.c', + 'pkix_pl_monitorlock.c', + 'pkix_pl_mutex.c', + 'pkix_pl_object.c', + 'pkix_pl_oid.c', + 'pkix_pl_primhash.c', + 'pkix_pl_rwlock.c', + 'pkix_pl_string.c' + ], + 'dependencies': [ + '<(DEPTH)/exports.gyp:nss_exports' + ] + } + ], + 'variables': { + 'module': 'nss' + } +}
\ No newline at end of file |