From bbc03c59358e01450156b354f31fe96964f8a462 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 10 Feb 2017 12:53:16 +0100 Subject: [PATCH] trustfence-cst: refresh patches with git Refresh the patches with GIT so they apply cleanly using "git am". Otherwise they fail with: Applying: openssl_helper: use /dev/urandom as seed source error: corrupt patch at line 16 Patch failed at 0003 openssl_helper: use /dev/urandom as seed source Applying: hab4_pki_tree.sh: usa a random password for the default PKI generation warning: keys/hab4_pki_tree.sh has type 100755, expected 100644 Notice that they were not failing in Yocto, as it does not use "git am" to apply patches, but it's better to have the patches correctly done. Signed-off-by: Javier Viguera --- .../0003-openssl_helper-use-dev-urandom-as-seed-source.patch | 2 ++ ...-hab4_pki_tree.sh-usa-a-random-password-for-the-defau.patch | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0003-openssl_helper-use-dev-urandom-as-seed-source.patch b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0003-openssl_helper-use-dev-urandom-as-seed-source.patch index 24dcbd229..d8a80eac2 100644 --- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0003-openssl_helper-use-dev-urandom-as-seed-source.patch +++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0003-openssl_helper-use-dev-urandom-as-seed-source.patch @@ -20,3 +20,5 @@ index 3c9c779092c5..f0cd4e06f0dd 100644 - return RAND_load_file("/dev/random", bytes); + return RAND_load_file("/dev/urandom", bytes); } + + diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0004-hab4_pki_tree.sh-usa-a-random-password-for-the-defau.patch b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0004-hab4_pki_tree.sh-usa-a-random-password-for-the-defau.patch index 6b668d7c3..ed165689a 100644 --- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0004-hab4_pki_tree.sh-usa-a-random-password-for-the-defau.patch +++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0004-hab4_pki_tree.sh-usa-a-random-password-for-the-defau.patch @@ -9,7 +9,7 @@ Signed-off-by: Diaz de Grenu, Jose 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/keys/hab4_pki_tree.sh b/keys/hab4_pki_tree.sh -index b2c6b71b604e..93347521cea1 100644 +index b2c6b71b604e..93347521cea1 100755 --- a/keys/hab4_pki_tree.sh +++ b/keys/hab4_pki_tree.sh @@ -95,9 +95,10 @@ fi @@ -26,4 +26,3 @@ index b2c6b71b604e..93347521cea1 100644 fi # The following is required otherwise OpenSSL complains -