upd: find libfaketime platform independently

diff --git a/generateCRLs.sh b/generateCRLs.sh
index 952d7576a9d959a59cda2215e7d511e2f3c205e3..9e4208154c9caefd4dc69805c1f03041e36555ed 100755 (executable)
--- 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
     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
 }
 
     popd > /dev/null
 }
 

diff --git a/generateInfra.sh b/generateInfra.sh
index 5106869d68cf10e2bb8cea8fca84269d7af9c924..6da93445678c8e858290068e91fed3de4daf7309 100755 (executable)
--- 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]}"
     
     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 5f02f99a2adc3bf7dbbd9f6564f95ce242918f86..3890eb56e2e3aa80d5ed17ddc89a1709b93ab12b 100755 (executable)
--- a/verify.sh
+++ b/verify.sh
@@ -27,7 +27,7 @@ X509v3 Authority Key Identifier:
 X509v3 CRL Distribution Points: 
 Authority Information Access: "
 
 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"

 
 }
 
 
 }