Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2017-02-10 12:53:16 +01:00
parent 44ae297ea8
commit bbc03c5935
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0003-openssl_helper-use-dev-urandom-as-seed-source.patch
View File

@ -20,3 +20,5 @@ index 3c9c779092c5..f0cd4e06f0dd 100644
- return RAND_load_file("/dev/random", bytes); - return RAND_load_file("/dev/random", bytes);
+ return RAND_load_file("/dev/urandom", bytes); + return RAND_load_file("/dev/urandom", bytes);
} }

3
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
View File

@ -9,7 +9,7 @@ Signed-off-by: Diaz de Grenu, Jose <Jose.DiazdeGrenu@digi.com>
1 file changed, 4 insertions(+), 3 deletions(-) 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/keys/hab4_pki_tree.sh b/keys/hab4_pki_tree.sh 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 --- a/keys/hab4_pki_tree.sh
+++ b/keys/hab4_pki_tree.sh +++ b/keys/hab4_pki_tree.sh
@@ -95,9 +95,10 @@ fi @@ -95,9 +95,10 @@ fi
@ -26,4 +26,3 @@ index b2c6b71b604e..93347521cea1 100644
fi fi
# The following is required otherwise OpenSSL complains # The following is required otherwise OpenSSL complains