From: Felix Dörre <felix@dogcraft.de>
Date: Sun, 23 Aug 2015 06:41:25 +0000 (+0200)
Subject: upd: find libfaketime platform independently
X-Git-Url: https://code.wpia.club/?p=nre.git;a=commitdiff_plain;h=26af5d502565f10a3d3d91192e5545f59075ca59

upd: find libfaketime platform independently
---

diff --git a/generateCRLs.sh b/generateCRLs.sh
index 952d757..9e42081 100755
--- a/generateCRLs.sh
+++ b/generateCRLs.sh
@@ -13,7 +13,7 @@ generateCRL() { # name, year, month
     echo CRL $1 $2-$3
     BASE="$PWD"
     pushd $1.ca > /dev/null
-    TZ=UTC LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 FAKETIME="${year}-${month}-01 00:00:00" openssl ca -gencrl -config "$BASE/../selfsign.config" -keyfile key.key -cert key.crt -crldays 35 -out $2_$3.crl
+    TZ=UTC LD_PRELOAD=`ls /usr/lib/*/faketime/libfaketime.so.1` FAKETIME="${year}-${month}-01 00:00:00" openssl ca -gencrl -config "$BASE/../selfsign.config" -keyfile key.key -cert key.crt -crldays 35 -out $2_$3.crl
     popd > /dev/null
 }
 
diff --git a/generateInfra.sh b/generateInfra.sh
index 5106869..6da9344 100755
--- a/generateInfra.sh
+++ b/generateInfra.sh
@@ -49,7 +49,7 @@ genserver(){ #key, subject, config
     openssl req -new -key $1.key -out $1.csr -subj "$2"
     caSign $1 $year/ca/env_${year}_1 "$3" "${year}${points[1]}" "$((${year} + 2))${points[1]}"
     
-    TZ=UTC LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 FAKETIME="${year}-01-01 00:00:00" openssl pkcs12 -inkey $1.key -in $1.crt -CAfile env.chain.crt -chain -name $1 -export -passout pass:changeit -out $1.pkcs12 -name "$4"
+    TZ=UTC LD_PRELOAD=`ls /usr/lib/*/faketime/libfaketime.so.1` FAKETIME="${year}-01-01 00:00:00" openssl pkcs12 -inkey $1.key -in $1.crt -CAfile env.chain.crt -chain -name $1 -export -passout pass:changeit -out $1.pkcs12 -name "$4"
     
 }
 
diff --git a/verify.sh b/verify.sh
index 5f02f99..3890eb5 100755
--- a/verify.sh
+++ b/verify.sh
@@ -27,7 +27,7 @@ X509v3 Authority Key Identifier:
 X509v3 CRL Distribution Points: 
 Authority Information Access: "
 
-	diff <(echo "$EXTLIST" | dos2unix) <(echo "$VAR" | dos2unix) || error "Extensions order is wrong for $ca"
+	diff <(echo "$EXTLIST") <(echo "$VAR") || error "Extensions order is wrong for $ca"
 
 }