Skip to content
Permalink
Browse files
Bug 1479787 - build mozpkix as part of NSS, r=mt,keeler
Differential Revision: https://phabricator.services.mozilla.com/D2719
Differential Revision: https://phabricator.services.mozilla.com/D2720
Differential Revision: https://phabricator.services.mozilla.com/D2861

--HG--
rename : cpputil/scoped_ptrs.h => cpputil/nss_scoped_ptrs.h
rename : lib/mozpkix/test/gtest/README.txt => gtests/mozpkix_gtest/README.txt
rename : lib/mozpkix/test/gtest/pkixbuild_tests.cpp => gtests/mozpkix_gtest/pkixbuild_tests.cpp
rename : lib/mozpkix/test/gtest/pkixcert_extension_tests.cpp => gtests/mozpkix_gtest/pkixcert_extension_tests.cpp
rename : lib/mozpkix/test/gtest/pkixcert_signature_algorithm_tests.cpp => gtests/mozpkix_gtest/pkixcert_signature_algorithm_tests.cpp
rename : lib/mozpkix/test/gtest/pkixcheck_CheckExtendedKeyUsage_tests.cpp => gtests/mozpkix_gtest/pkixcheck_CheckExtendedKeyUsage_tests.cpp
rename : lib/mozpkix/test/gtest/pkixcheck_CheckIssuer_tests.cpp => gtests/mozpkix_gtest/pkixcheck_CheckIssuer_tests.cpp
rename : lib/mozpkix/test/gtest/pkixcheck_CheckKeyUsage_tests.cpp => gtests/mozpkix_gtest/pkixcheck_CheckKeyUsage_tests.cpp
rename : lib/mozpkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp => gtests/mozpkix_gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp
rename : lib/mozpkix/test/gtest/pkixcheck_CheckValidity_tests.cpp => gtests/mozpkix_gtest/pkixcheck_CheckValidity_tests.cpp
rename : lib/mozpkix/test/gtest/pkixcheck_ParseValidity_tests.cpp => gtests/mozpkix_gtest/pkixcheck_ParseValidity_tests.cpp
rename : lib/mozpkix/test/gtest/pkixcheck_TLSFeaturesSatisfiedInternal_tests.cpp => gtests/mozpkix_gtest/pkixcheck_TLSFeaturesSatisfiedInternal_tests.cpp
rename : lib/mozpkix/test/gtest/pkixder_input_tests.cpp => gtests/mozpkix_gtest/pkixder_input_tests.cpp
rename : lib/mozpkix/test/gtest/pkixder_pki_types_tests.cpp => gtests/mozpkix_gtest/pkixder_pki_types_tests.cpp
rename : lib/mozpkix/test/gtest/pkixder_universal_types_tests.cpp => gtests/mozpkix_gtest/pkixder_universal_types_tests.cpp
rename : lib/mozpkix/test/gtest/pkixgtest.cpp => gtests/mozpkix_gtest/pkixgtest.cpp
rename : lib/mozpkix/test/gtest/pkixgtest.h => gtests/mozpkix_gtest/pkixgtest.h
rename : lib/mozpkix/test/gtest/pkixnames_tests.cpp => gtests/mozpkix_gtest/pkixnames_tests.cpp
rename : lib/mozpkix/test/gtest/pkixocsp_CreateEncodedOCSPRequest_tests.cpp => gtests/mozpkix_gtest/pkixocsp_CreateEncodedOCSPRequest_tests.cpp
rename : lib/mozpkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp => gtests/mozpkix_gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
rename : lib/mozpkix/test/lib/pkixtestnss.h => lib/mozpkix/include/pkix-test/pkixtestnss.h
rename : lib/mozpkix/test/lib/pkixtestutil.h => lib/mozpkix/include/pkix-test/pkixtestutil.h
rename : lib/mozpkix/lib/pkixcheck.h => lib/mozpkix/include/pkix/pkixcheck.h
rename : lib/mozpkix/lib/pkixder.h => lib/mozpkix/include/pkix/pkixder.h
rename : lib/mozpkix/lib/pkixutil.h => lib/mozpkix/include/pkix/pkixutil.h
rename : lib/mozpkix/test/lib/pkixtestalg.cpp => lib/mozpkix/test-lib/pkixtestalg.cpp
rename : lib/mozpkix/test/lib/pkixtestnss.cpp => lib/mozpkix/test-lib/pkixtestnss.cpp
rename : lib/mozpkix/test/lib/pkixtestutil.cpp => lib/mozpkix/test-lib/pkixtestutil.cpp
extra : rebase_source : 7b1375fef0c8e0c361f44d16f69c31d0bd6d0b41
  • Loading branch information
franziskuskiefer committed Aug 3, 2018
1 parent bac4358 commit 53850b9292fbcfe2541ac7a2d8cacd3df557f750
Showing with 608 additions and 624 deletions.
  1. +1 −0 build.sh
  2. +9 −0 coreconf/config.gypi
  3. +1 −1 cpputil/dummy_io.h
  4. +7 −8 cpputil/{scoped_ptrs.h → nss_scoped_ptrs.h}
  5. +35 −0 cpputil/scoped_ptrs_ssl.h
  6. +77 −58 exports.gyp
  7. +1 −1 fuzz/tls_server_certs.cc
  8. +1 −1 gtests/certdb_gtest/alg1485_unittest.cc
  9. +1 −1 gtests/cryptohi_gtest/cryptohi_unittest.cc
  10. +1 −1 gtests/der_gtest/der_private_key_import_unittest.cc
  11. +1 −1 gtests/der_gtest/p12_import_unittest.cc
  12. +1 −1 gtests/freebl_gtest/ecl_unittest.cc
  13. 0 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/README.txt
  14. +71 −0 gtests/mozpkix_gtest/mozpkix_gtest.gyp
  15. +16 −15 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixbuild_tests.cpp
  16. +3 −2 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixcert_extension_tests.cpp
  17. +2 −1 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixcert_signature_algorithm_tests.cpp
  18. +3 −2 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixcheck_CheckExtendedKeyUsage_tests.cpp
  19. +2 −1 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixcheck_CheckIssuer_tests.cpp
  20. 0 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixcheck_CheckKeyUsage_tests.cpp
  21. +2 −1 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixcheck_CheckSignatureAlgorithm_tests.cpp
  22. +2 −1 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixcheck_CheckValidity_tests.cpp
  23. +2 −1 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixcheck_ParseValidity_tests.cpp
  24. +2 −1 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixcheck_TLSFeaturesSatisfiedInternal_tests.cpp
  25. +1 −1 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixder_input_tests.cpp
  26. +3 −2 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixder_pki_types_tests.cpp
  27. +2 −1 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixder_universal_types_tests.cpp
  28. +1 −1 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixgtest.cpp
  29. +2 −2 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixgtest.h
  30. +4 −3 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixnames_tests.cpp
  31. +2 −1 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixocsp_CreateEncodedOCSPRequest_tests.cpp
  32. +3 −3 {lib/mozpkix/test/gtest → gtests/mozpkix_gtest}/pkixocsp_VerifyEncodedOCSPResponse.cpp
  33. +1 −1 gtests/nss_bogo_shim/nss_bogo_shim.cc
  34. +1 −1 gtests/pk11_gtest/pk11_aes_gcm_unittest.cc
  35. +2 −2 gtests/pk11_gtest/pk11_aeskeywrap_unittest.cc
  36. +1 −1 gtests/pk11_gtest/pk11_chacha20poly1305_unittest.cc
  37. +1 −1 gtests/pk11_gtest/pk11_curve25519_unittest.cc
  38. +1 −1 gtests/pk11_gtest/pk11_der_private_key_import_unittest.cc
  39. +1 −1 gtests/pk11_gtest/pk11_ecdsa_unittest.cc
  40. +1 −1 gtests/pk11_gtest/pk11_encrypt_derive_unittest.cc
  41. +1 −1 gtests/pk11_gtest/pk11_export_unittest.cc
  42. +1 −1 gtests/pk11_gtest/pk11_pbkdf2_unittest.cc
  43. +1 −1 gtests/pk11_gtest/pk11_rsapkcs1_unittest.cc
  44. +1 −1 gtests/pk11_gtest/pk11_rsapss_unittest.cc
  45. +1 −1 gtests/pk11_gtest/pk11_signature_test.h
  46. +1 −1 gtests/softoken_gtest/softoken_gtest.cc
  47. +1 −1 gtests/ssl_gtest/selfencrypt_unittest.cc
  48. +1 −1 gtests/ssl_gtest/ssl_0rtt_unittest.cc
  49. +1 −1 gtests/ssl_gtest/ssl_auth_unittest.cc
  50. +1 −1 gtests/ssl_gtest/ssl_damage_unittest.cc
  51. +1 −1 gtests/ssl_gtest/ssl_dhe_unittest.cc
  52. +1 −1 gtests/ssl_gtest/ssl_drop_unittest.cc
  53. +1 −1 gtests/ssl_gtest/ssl_ecdh_unittest.cc
  54. +1 −1 gtests/ssl_gtest/ssl_ems_unittest.cc
  55. +1 −1 gtests/ssl_gtest/ssl_fragment_unittest.cc
  56. +1 −1 gtests/ssl_gtest/ssl_hrr_unittest.cc
  57. +1 −1 gtests/ssl_gtest/ssl_keyupdate_unittest.cc
  58. +1 −1 gtests/ssl_gtest/ssl_loopback_unittest.cc
  59. +1 −1 gtests/ssl_gtest/ssl_recordsize_unittest.cc
  60. +2 −1 gtests/ssl_gtest/ssl_resumption_unittest.cc
  61. +1 −1 gtests/ssl_gtest/ssl_staticrsa_unittest.cc
  62. +1 −1 gtests/ssl_gtest/ssl_version_unittest.cc
  63. +1 −1 gtests/ssl_gtest/ssl_versionpolicy_unittest.cc
  64. +1 −1 gtests/ssl_gtest/test_io.h
  65. +1 −1 gtests/ssl_gtest/tls_agent.cc
  66. +2 −1 gtests/ssl_gtest/tls_agent.h
  67. +1 −1 gtests/ssl_gtest/tls_connect.cc
  68. +1 −1 gtests/ssl_gtest/tls_hkdf_unittest.cc
  69. +3 −1 help.txt
  70. +4 −0 lib/mozpkix/.clang-format
  71. +47 −0 lib/mozpkix/exports.gyp
  72. +4 −8 lib/mozpkix/{test/lib → include/pkix-test}/pkixtestnss.h
  73. +3 −4 lib/mozpkix/{test/lib → include/pkix-test}/pkixtestutil.h
  74. +1 −1 lib/mozpkix/include/pkix/Input.h
  75. +1 −1 lib/mozpkix/include/pkix/Time.h
  76. +1 −1 lib/mozpkix/include/pkix/pkix.h
  77. +1 −1 lib/mozpkix/{lib → include/pkix}/pkixcheck.h
  78. +2 −2 lib/mozpkix/{lib → include/pkix}/pkixder.h
  79. +2 −2 lib/mozpkix/include/pkix/pkixnss.h
  80. +5 −2 lib/mozpkix/include/pkix/pkixtypes.h
  81. +1 −1 lib/mozpkix/{lib → include/pkix}/pkixutil.h
  82. +0 −83 lib/mozpkix/lib/ScopedPtr.h
  83. +3 −3 lib/mozpkix/lib/pkixbuild.cpp
  84. +1 −1 lib/mozpkix/lib/pkixcert.cpp
  85. +3 −3 lib/mozpkix/lib/pkixcheck.cpp
  86. +2 −2 lib/mozpkix/lib/pkixder.cpp
  87. +2 −2 lib/mozpkix/lib/pkixnames.cpp
  88. +6 −6 lib/mozpkix/lib/pkixnss.cpp
  89. +3 −3 lib/mozpkix/lib/pkixocsp.cpp
  90. +2 −2 lib/mozpkix/lib/pkixresult.cpp
  91. +4 −4 lib/mozpkix/lib/pkixtime.cpp
  92. +1 −1 lib/mozpkix/lib/pkixverify.cpp
  93. +0 −36 lib/mozpkix/moz.build
  94. +60 −0 lib/mozpkix/mozpkix.gyp
  95. +3 −2 lib/mozpkix/{test/lib → test-lib}/pkixtestalg.cpp
  96. +12 −26 lib/mozpkix/{test/lib → test-lib}/pkixtestnss.cpp
  97. +13 −13 lib/mozpkix/{test/lib → test-lib}/pkixtestutil.cpp
  98. +0 −72 lib/mozpkix/test/gtest/moz.build
  99. +0 −39 lib/mozpkix/test/lib/moz.build
  100. +0 −52 lib/mozpkix/warnings.mozbuild
  101. +1 −1 nss-tool/common/util.h
  102. +1 −1 nss-tool/db/dbtool.cc
  103. +1 −1 nss-tool/digest/digesttool.cc
  104. +1 −1 nss-tool/enc/enctool.h
  105. +116 −97 nss.gyp
@@ -99,6 +99,7 @@ while [ $# -gt 0 ]; do
--system-nspr) set_nspr_path "/usr/include/nspr/:"; no_local_nspr=1 ;;
--enable-libpkix) gyp_params+=(-Ddisable_libpkix=0) ;;
--enable-fips) gyp_params+=(-Ddisable_fips=0) ;;
--mozpkix-only) gyp_params+=(-Dmozpkix_only=1 -Ddisable_tests=1 -Dsign_libs=0) ;;
*) show_help; exit 2 ;;
esac
shift
@@ -108,8 +108,12 @@
'emit_llvm%': 0,
'nss_public_dist_dir%': '<(nss_dist_dir)/public',
'nss_private_dist_dir%': '<(nss_dist_dir)/private',
# This is only needed when building with --mozpkix-only and might not work
# on all machines.
'nss_include_dir%': '/usr/include/nss',
'only_dev_random%': 1,
'disable_fips%': 1,
'mozpkix_only%': 0,
},
'target_defaults': {
# Settings specific to targets should go here.
@@ -126,6 +130,11 @@
'<(nss_dist_dir)/private/<(module)',
],
'conditions': [
[ 'mozpkix_only==1 and OS=="linux"', {
'include_dirs': [
'<(nss_include_dir)',
],
}],
[ 'disable_fips==1', {
'defines': [
'NSS_FIPS_DISABLED',
@@ -8,7 +8,7 @@
#include "prerror.h"
#include "prio.h"

#include "scoped_ptrs.h"
#include "nss_scoped_ptrs.h"

class DummyIOLayerMethods {
public:
@@ -4,16 +4,15 @@
* 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 scoped_ptrs_h__
#define scoped_ptrs_h__
#ifndef nss_scoped_ptrs_h__
#define nss_scoped_ptrs_h__

#include <memory>
#include "cert.h"
#include "keyhi.h"
#include "p12.h"
#include "pk11pub.h"
#include "pkcs11uri.h"
#include "sslexp.h"

struct ScopedDelete {
void operator()(CERTCertificate* cert) { CERT_DestroyCertificate(cert); }
@@ -29,6 +28,9 @@ struct ScopedDelete {
void operator()(PK11SymKey* key) { PK11_FreeSymKey(key); }
void operator()(PRFileDesc* fd) { PR_Close(fd); }
void operator()(SECAlgorithmID* id) { SECOID_DestroyAlgorithmID(id, true); }
void operator()(SECKEYEncryptedPrivateKeyInfo* e) {
SECKEY_DestroyEncryptedPrivateKeyInfo(e, true);
}
void operator()(SECItem* item) { SECITEM_FreeItem(item, true); }
void operator()(SECKEYPublicKey* key) { SECKEY_DestroyPublicKey(key); }
void operator()(SECKEYPrivateKey* key) { SECKEY_DestroyPrivateKey(key); }
@@ -39,9 +41,6 @@ struct ScopedDelete {
void operator()(PLArenaPool* arena) { PORT_FreeArena(arena, PR_FALSE); }
void operator()(PK11Context* context) { PK11_DestroyContext(context, true); }
void operator()(PK11GenericObject* obj) { PK11_DestroyGenericObject(obj); }
void operator()(SSLResumptionTokenInfo* token) {
SSL_DestroyResumptionTokenInfo(token);
}
void operator()(SEC_PKCS12DecoderContext* dcx) {
SEC_PKCS12DecoderFinish(dcx);
}
@@ -69,6 +68,7 @@ SCOPED(PK11SlotInfo);
SCOPED(PK11SymKey);
SCOPED(PRFileDesc);
SCOPED(SECAlgorithmID);
SCOPED(SECKEYEncryptedPrivateKeyInfo);
SCOPED(SECItem);
SCOPED(SECKEYPublicKey);
SCOPED(SECKEYPrivateKey);
@@ -77,10 +77,9 @@ SCOPED(PK11URI);
SCOPED(PLArenaPool);
SCOPED(PK11Context);
SCOPED(PK11GenericObject);
SCOPED(SSLResumptionTokenInfo);
SCOPED(SEC_PKCS12DecoderContext);
SCOPED(CERTDistNames);

#undef SCOPED

#endif // scoped_ptrs_h__
#endif // nss_scoped_ptrs_h__
@@ -0,0 +1,35 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* 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 scoped_ptrs_ssl_h__
#define scoped_ptrs_ssl_h__

#include <memory>
#include "sslexp.h"

struct ScopedDeleteSSL {
void operator()(SSLResumptionTokenInfo* token) {
SSL_DestroyResumptionTokenInfo(token);
}
};

template <class T>
struct ScopedMaybeDeleteSSL {
void operator()(T* ptr) {
if (ptr) {
ScopedDeleteSSL del;
del(ptr);
}
}
};

#define SCOPED(x) typedef std::unique_ptr<x, ScopedMaybeDeleteSSL<x> > Scoped##x

SCOPED(SSLResumptionTokenInfo);

#undef SCOPED

#endif // scoped_ptrs_ssl_h__
@@ -5,73 +5,92 @@
'includes': [
'coreconf/config.gypi'
],
'conditions': [
[ 'mozpkix_only==0', {
'targets': [
{
'target_name': 'nss_exports',
'type': 'none',
'direct_dependent_settings': {
'include_dirs': [
'<(nss_public_dist_dir)/nss',
]
},
'dependencies': [
'cmd/lib/exports.gyp:cmd_lib_exports',
'lib/base/exports.gyp:lib_base_exports',
'lib/certdb/exports.gyp:lib_certdb_exports',
'lib/certhigh/exports.gyp:lib_certhigh_exports',
'lib/ckfw/builtins/exports.gyp:lib_ckfw_builtins_exports',
'lib/ckfw/exports.gyp:lib_ckfw_exports',
'lib/crmf/exports.gyp:lib_crmf_exports',
'lib/cryptohi/exports.gyp:lib_cryptohi_exports',
'lib/dev/exports.gyp:lib_dev_exports',
'lib/freebl/exports.gyp:lib_freebl_exports',
'lib/jar/exports.gyp:lib_jar_exports',
'lib/nss/exports.gyp:lib_nss_exports',
'lib/pk11wrap/exports.gyp:lib_pk11wrap_exports',
'lib/pkcs12/exports.gyp:lib_pkcs12_exports',
'lib/pkcs7/exports.gyp:lib_pkcs7_exports',
'lib/pki/exports.gyp:lib_pki_exports',
'lib/smime/exports.gyp:lib_smime_exports',
'lib/softoken/exports.gyp:lib_softoken_exports',
'lib/sqlite/exports.gyp:lib_sqlite_exports',
'lib/ssl/exports.gyp:lib_ssl_exports',
'lib/util/exports.gyp:lib_util_exports',
'lib/zlib/exports.gyp:lib_zlib_exports',
],
'conditions': [
[ 'disable_libpkix==0', {
'dependencies': [
'lib/libpkix/include/exports.gyp:lib_libpkix_include_exports',
'lib/libpkix/pkix/certsel/exports.gyp:lib_libpkix_pkix_certsel_exports',
'lib/libpkix/pkix/checker/exports.gyp:lib_libpkix_pkix_checker_exports',
'lib/libpkix/pkix/crlsel/exports.gyp:lib_libpkix_pkix_crlsel_exports',
'lib/libpkix/pkix/params/exports.gyp:lib_libpkix_pkix_params_exports',
'lib/libpkix/pkix/results/exports.gyp:lib_libpkix_pkix_results_exports',
'lib/libpkix/pkix/store/exports.gyp:lib_libpkix_pkix_store_exports',
'lib/libpkix/pkix/top/exports.gyp:lib_libpkix_pkix_top_exports',
'lib/libpkix/pkix/util/exports.gyp:lib_libpkix_pkix_util_exports',
'lib/libpkix/pkix_pl_nss/module/exports.gyp:lib_libpkix_pkix_pl_nss_module_exports',
'lib/libpkix/pkix_pl_nss/pki/exports.gyp:lib_libpkix_pkix_pl_nss_pki_exports',
'lib/libpkix/pkix_pl_nss/system/exports.gyp:lib_libpkix_pkix_pl_nss_system_exports',
],
}],
],
},
{
'target_name': 'dbm_exports',
'type': 'none',
'conditions': [
['disable_dbm==0', {
'direct_dependent_settings': {
'include_dirs': [
'<(nss_public_dist_dir)/dbm'
]
},
'dependencies': [
'lib/dbm/include/exports.gyp:lib_dbm_include_exports'
],
}],
],
}
],
}],
],
'targets': [
{
'target_name': 'nss_exports',
'target_name': 'nss_mozpkix_exports',
'type': 'none',
'direct_dependent_settings': {
'include_dirs': [
'<(nss_public_dist_dir)/nss'
]
},
'dependencies': [
'cmd/lib/exports.gyp:cmd_lib_exports',
'lib/base/exports.gyp:lib_base_exports',
'lib/certdb/exports.gyp:lib_certdb_exports',
'lib/certhigh/exports.gyp:lib_certhigh_exports',
'lib/ckfw/builtins/exports.gyp:lib_ckfw_builtins_exports',
'lib/ckfw/exports.gyp:lib_ckfw_exports',
'lib/crmf/exports.gyp:lib_crmf_exports',
'lib/cryptohi/exports.gyp:lib_cryptohi_exports',
'lib/dev/exports.gyp:lib_dev_exports',
'lib/freebl/exports.gyp:lib_freebl_exports',
'lib/jar/exports.gyp:lib_jar_exports',
'lib/nss/exports.gyp:lib_nss_exports',
'lib/pk11wrap/exports.gyp:lib_pk11wrap_exports',
'lib/pkcs12/exports.gyp:lib_pkcs12_exports',
'lib/pkcs7/exports.gyp:lib_pkcs7_exports',
'lib/pki/exports.gyp:lib_pki_exports',
'lib/smime/exports.gyp:lib_smime_exports',
'lib/softoken/exports.gyp:lib_softoken_exports',
'lib/sqlite/exports.gyp:lib_sqlite_exports',
'lib/ssl/exports.gyp:lib_ssl_exports',
'lib/util/exports.gyp:lib_util_exports',
'lib/zlib/exports.gyp:lib_zlib_exports'
],
'conditions': [
[ 'disable_libpkix==0', {
'dependencies': [
'lib/libpkix/include/exports.gyp:lib_libpkix_include_exports',
'lib/libpkix/pkix/certsel/exports.gyp:lib_libpkix_pkix_certsel_exports',
'lib/libpkix/pkix/checker/exports.gyp:lib_libpkix_pkix_checker_exports',
'lib/libpkix/pkix/crlsel/exports.gyp:lib_libpkix_pkix_crlsel_exports',
'lib/libpkix/pkix/params/exports.gyp:lib_libpkix_pkix_params_exports',
'lib/libpkix/pkix/results/exports.gyp:lib_libpkix_pkix_results_exports',
'lib/libpkix/pkix/store/exports.gyp:lib_libpkix_pkix_store_exports',
'lib/libpkix/pkix/top/exports.gyp:lib_libpkix_pkix_top_exports',
'lib/libpkix/pkix/util/exports.gyp:lib_libpkix_pkix_util_exports',
'lib/libpkix/pkix_pl_nss/module/exports.gyp:lib_libpkix_pkix_pl_nss_module_exports',
'lib/libpkix/pkix_pl_nss/pki/exports.gyp:lib_libpkix_pkix_pl_nss_pki_exports',
'lib/libpkix/pkix_pl_nss/system/exports.gyp:lib_libpkix_pkix_pl_nss_system_exports',
],
}],
'lib/mozpkix/exports.gyp:lib_mozpkix_exports',
'lib/mozpkix/exports.gyp:lib_mozpkix_test_exports',
],
},
{
'target_name': 'dbm_exports',
'type': 'none',
'conditions': [
['disable_dbm==0', {
'direct_dependent_settings': {
'include_dirs': [
'<(nss_public_dist_dir)/dbm'
]
},
'dependencies': [
'lib/dbm/include/exports.gyp:lib_dbm_include_exports'
],
}],
],
}
]
],
}
@@ -8,7 +8,7 @@
#include "ssl.h"

#include "cpputil.h"
#include "scoped_ptrs.h"
#include "nss_scoped_ptrs.h"
#include "tls_server_certs.h"

const uint8_t kP256ServerCert[] = {
@@ -9,7 +9,7 @@
#include "gtest/gtest.h"

#include "nss.h"
#include "scoped_ptrs.h"
#include "nss_scoped_ptrs.h"
#include "prprf.h"

namespace nss_test {
@@ -8,7 +8,7 @@

#include "gtest/gtest.h"

#include "scoped_ptrs.h"
#include "nss_scoped_ptrs.h"
#include "cryptohi.h"
#include "secitem.h"
#include "secerr.h"
@@ -11,7 +11,7 @@
#include "secutil.h"

#include "gtest/gtest.h"
#include "scoped_ptrs.h"
#include "nss_scoped_ptrs.h"

namespace nss_test {

@@ -8,7 +8,7 @@
#include "p12.h"

#include "gtest/gtest.h"
#include "scoped_ptrs.h"
#include "nss_scoped_ptrs.h"

namespace nss_test {

@@ -7,7 +7,7 @@
#include <stdint.h>

#include "blapi.h"
#include "scoped_ptrs.h"
#include "nss_scoped_ptrs.h"
#include "secerr.h"

namespace nss_test {
File renamed without changes.

0 comments on commit 53850b9

Please sign in to comment.