summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/nss/nss/blank-cert9.dbbin0 -> 28672 bytes
-rw-r--r--meta/recipes-support/nss/nss/blank-key4.dbbin0 -> 36864 bytes
-rw-r--r--meta/recipes-support/nss/nss/system-pkcs11.txt5
-rw-r--r--meta/recipes-support/nss/nss_3.38.bb21
4 files changed, 18 insertions, 8 deletions
diff --git a/meta/recipes-support/nss/nss/blank-cert9.db b/meta/recipes-support/nss/nss/blank-cert9.db
new file mode 100644
index 0000000000..7d4bcf2582
--- /dev/null
+++ b/meta/recipes-support/nss/nss/blank-cert9.db
Binary files differ
diff --git a/meta/recipes-support/nss/nss/blank-key4.db b/meta/recipes-support/nss/nss/blank-key4.db
new file mode 100644
index 0000000000..d47f08d04f
--- /dev/null
+++ b/meta/recipes-support/nss/nss/blank-key4.db
Binary files differ
diff --git a/meta/recipes-support/nss/nss/system-pkcs11.txt b/meta/recipes-support/nss/nss/system-pkcs11.txt
new file mode 100644
index 0000000000..1a264e9cc4
--- /dev/null
+++ b/meta/recipes-support/nss/nss/system-pkcs11.txt
@@ -0,0 +1,5 @@
1library=
2name=NSS Internal PKCS #11 Module
3parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription=''
4NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
5
diff --git a/meta/recipes-support/nss/nss_3.38.bb b/meta/recipes-support/nss/nss_3.38.bb
index 904b621a07..e0ee209106 100644
--- a/meta/recipes-support/nss/nss_3.38.bb
+++ b/meta/recipes-support/nss/nss_3.38.bb
@@ -25,6 +25,9 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
25 file://nss-fix-nsinstall-build.patch \ 25 file://nss-fix-nsinstall-build.patch \
26 file://disable-Wvarargs-with-clang.patch \ 26 file://disable-Wvarargs-with-clang.patch \
27 file://pqg.c-ULL_addend.patch \ 27 file://pqg.c-ULL_addend.patch \
28 file://blank-cert9.db \
29 file://blank-key4.db \
30 file://system-pkcs11.txt \
28 " 31 "
29 32
30SRC_URI[md5sum] = "ac9065460a7634ba8eb0f942f404e773" 33SRC_URI[md5sum] = "ac9065460a7634ba8eb0f942f404e773"
@@ -212,14 +215,16 @@ do_install_append() {
212} 215}
213 216
214do_install_append_class-target() { 217do_install_append_class-target() {
215 # Create a blank certificate 218 # It used to call certutil to create a blank certificate with empty password at
216 mkdir -p ${D}${sysconfdir}/pki/nssdb/ 219 # build time, but the checksum of key4.db changes every time when certutil is called.
217 touch ./empty_password 220 # It causes non-determinism issue, so provide databases with a blank certificate
218 certutil -N -d sql:${D}${sysconfdir}/pki/nssdb/ -f ./empty_password 221 # which are originally from output of nss in qemux86-64 build. You can get these
219 chmod 644 ${D}${sysconfdir}/pki/nssdb/*.db 222 # databases by:
220 rm ./empty_password 223 # certutil -N -d sql:/database/path/ --empty-password
221 # Remove build path prefix 224 install -d ${D}${sysconfdir}/pki/nssdb/
222 sed -i "s:${D}::g" ${D}${sysconfdir}/pki/nssdb/pkcs11.txt 225 install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db
226 install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db
227 install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt
223} 228}
224 229
225PACKAGE_WRITE_DEPS += "nss-native" 230PACKAGE_WRITE_DEPS += "nss-native"