Skip to content

Commit 2741acb

Browse files
alexmyczkoalexmyczko
authored
Add files via upload
1 parent 20ab289 commit 2741acb

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

‎ruptime

+15-16
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ else
2121
fi
2222

2323
if [ -f /etc/ruptime/ruptime.key ]; then
24-
KEY="/etc/ruptime/ruptime.key"
24+
export KEY=$(cat /etc/ruptime/ruptime.key)
2525
else
2626
defaults read ch.aiei.ruptime 2>/dev/null >/dev/null
2727
if [ ! $? = 0 ]; then
2828
echo "NO KEY FOUND in /etc/ruptime/ruptime.key"; exit 1
2929
else
3030
#echo "FOUND defaults";
31-
KEY=$(defaults read ch.aiei.ruptime KEY)
32-
export MCRYPT_KEY=$KEY
31+
export KEY=$(defaults read ch.aiei.ruptime KEY)
3332
fi
3433
fi
3534

@@ -82,10 +81,10 @@ if [ "${1}x" = "-ux" ]; then
8281
s=$(echo $(sw_vers 2>/dev/null | awk -v OFS="" '{$1=""}{print}'))
8382
;;
8483
esac
85-
u=$(printf "%-28s %s, %s\n" "$k" "`uname -srm`" "$s" | mcrypt -f "$KEY" -Fq | base64 -w0)
84+
u=$(printf "%-28s %s, %s\n" "$k" "`uname -srm`" "$s" | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
8685
;;
8786
ruptime)
88-
u=$(uptime|sed 's/ days\{0,1\},[[:blank:]]\{1,\}/+/; s/ averages\{0,1\}://; s/ min//;s/,//g'|awk -v h=$(eval "$HOSTNAMECMD") '{$1="";printf "%-28s %s %11s %2s %5s %s %6s %6s %6s\n", h, $2, $3, $4, $5, $6, $7, $8, $9}' | mcrypt -f "$KEY" -Fq | base64 -w0)
87+
u=$(uptime|sed 's/ days\{0,1\},[[:blank:]]\{1,\}/+/; s/ averages\{0,1\}://; s/ min//;s/,//g'|awk -v h=$(eval "$HOSTNAMECMD") '{$1="";printf "%-28s %s %11s %2s %5s %s %6s %6s %6s\n", h, $2, $3, $4, $5, $6, $7, $8, $9}' | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
8988
;;
9089
rsw)
9190
rsw=$(for a in dpkg rpm nix snap spack flatpak pip2 pip3 brew zypper; do
@@ -101,7 +100,7 @@ rsw=$(for a in dpkg rpm nix snap spack flatpak pip2 pip3 brew zypper; do
101100
which $a &>/dev/null && if [ $a == "zypper" ]; then num=$(zypper search --installed-only | grep package$ | wc -l); fi
102101
if [ ${num}x != x ]; then echo -ne "$a $(echo $num) "; fi
103102
done)
104-
u=$(printf "%-28s %s\n" "$k" "$rsw" | mcrypt -f "$KEY" -Fq | base64 -w0)
103+
u=$(printf "%-28s %s\n" "$k" "$rsw" | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
105104
;;
106105
rhw)
107106
biosdate=$(dmidecode -s bios-release-date 2>/dev/null | sed 's,/, ,g'|awk '{print $3"/"$1"/"$2}')
@@ -117,17 +116,17 @@ done)
117116
cores=$(getconf _NPROCESSORS_ONLN)
118117
gpu=0; which nvidia-smi >/dev/null && gpu=$(nvidia-smi --query-gpu=utilization.gpu,utilization.memory --format=csv|sed 1d|wc -l)
119118
# macOS number-of-GPU-cores system_profiler SPDisplaysDataType |grep "Cores"
120-
u=$(printf "%-28s %s\n" "$k" "$biosdate $sys $cores $mem $gpu" | mcrypt -f "$KEY" -Fq | base64 -w0)
119+
u=$(printf "%-28s %s\n" "$k" "$biosdate $sys $cores $mem $gpu" | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
121120
# macOS system_profiler SPHardwareDataType
122121
;;
123122
rac)
124123
ac=$(ac | awk '{print $2}')
125124
nu=$(ac -p |sed 1d |wc -l)
126-
u=$(printf "%-28s %s %s\n" "$k" "$ac" "$nu" | mcrypt -f "$KEY" -Fq | base64 -w0)
125+
u=$(printf "%-28s %s %s\n" "$k" "$ac" "$nu" | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
127126
;;
128127
rwho)
129128
w=$(who |sed "s/ [a-zA-Z:]/ $(eval "$HOSTNAMECMD"):&/1;s,: ,:,1")
130-
u=$(printf "%s\n" "$w" | mcrypt -f "$KEY" -Fq | base64 -w0)
129+
u=$(printf "%s\n" "$w" | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
131130
;;
132131
rbench)
133132
dt=date
@@ -144,7 +143,7 @@ done)
144143
/bin/echo "scale=3000;4*a(1)" | bc -l &>/dev/null
145144
end2=$($dt +%s.%N)
146145
cpu=$(printf "CPU %.2f %s\n" $(echo $end2 - $start2 | bc) $cores)
147-
u=$(printf "%-28s %s\n" "$k" "$mem $cpu" | mcrypt -f "$KEY" -Fq | base64 -w0)
146+
u=$(printf "%-28s %s\n" "$k" "$mem $cpu" | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
148147
;;
149148
rboot)
150149
r=0
@@ -157,7 +156,7 @@ done)
157156
# something is running
158157
cpu=$(uptime | sed s,.*:,,g | sed s/,//g|awk '{printf("%.0f\n",$(NF-2))}')
159158
r=$((r + cpu))
160-
u=$(printf "%-28s %s\n" "$k" "users $liun screen/tmux $sotn CPU $cpu gore $r" | mcrypt -f "$KEY" -Fq | base64 -w0)
159+
u=$(printf "%-28s %s\n" "$k" "users $liun screen/tmux $sotn CPU $cpu gore $r" | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
161160
;;
162161
rnet)
163162
netdev=$(ip r |grep ^default |head -1|sed "s,.*dev ,,g" |awk '{print $1}')
@@ -166,19 +165,19 @@ done)
166165
if [ "$r" = 0 ]; then
167166
l=$(iwconfig $s 2>/dev/null|grep "Link Quality=" | sed "s,Link Quality=,," | awk '{print $1"*100"}' | bc -l);\
168167
s2=$(iwconfig $s 2>/dev/null|grep "Bit Rate" | sed "s,Bit Rate=,,;s, Mb,Mb,"|awk '{print $1}'); \
169-
u=$(printf "%-28s %s %s %.0f\n" "$k" "$s" "$s2" "$l" | mcrypt -f "$KEY" -Fq | base64 -w0)
168+
u=$(printf "%-28s %s %s %.0f\n" "$k" "$s" "$s2" "$l" | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
170169
else
171170
netdev=$(ip r |grep ^default |head -1|sed "s,.*dev ,,g" |awk '{print $1}')
172171
s=$(echo "$netdev $(cat /sys/class/net/${netdev}/speed)Mb/s")
173-
u=$(printf "%-28s %s\n" "$k" "$s" | mcrypt -f "$KEY" -Fq | base64 -w0)
172+
u=$(printf "%-28s %s\n" "$k" "$s" | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
174173
fi
175174
# macOS
176175
# scutil --nwi |tail -1|awk '{print $NF}'
177176
# /System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I
178177
;;
179178
rdisk)
180179
s=$(echo $(for a in $(ls /dev/ada? /dev/sd? /dev/xvd? /dev/vd? /dev/nvme?n1 /dev/mmcblk? /dev/md[0-9]* 2>/dev/null | sed s,/dev/,,); do echo $a $(fdisk -l /dev/$a 2>/dev/null |grep ^Disk | awk '{printf "%1.0f\n", $5/1000/1000/1000}' | head -1); done))
181-
u=$(printf "%-28s %s\n" "$k" "$s" | mcrypt -f "$KEY" -Fq | base64 -w0)
180+
u=$(printf "%-28s %s\n" "$k" "$s" | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
182181
# macOS: diskutil info /dev/disk0 |grep Size
183182
;;
184183
rload)
@@ -194,7 +193,7 @@ done)
194193
m=$(printf "%6.2f\n" $(echo Mem: $total $used |awk '{print 100*$3/$2}'))
195194
;;
196195
esac
197-
u=$(printf "%-28s %s %s %s %s\n" "$k" "$s" "$m" "$gpu" | mcrypt -f "$KEY" -Fq | base64 -w0)
196+
u=$(printf "%-28s %s %s %s %s\n" "$k" "$s" "$m" "$gpu" | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -)
198197
;;
199198
*)
200199
echo "PROTOCOL ERROR"
@@ -208,4 +207,4 @@ fi
208207
d=$(basename "$0")
209208
(echo xz."$d") |
210209
(nc "$SERVER" "$PORT") |
211-
(base64 -d | mcrypt -d -f "$KEY" -Fq | xz -d 2>/dev/null || echo "NO DATA FOUND ($?)" 1>&2)
210+
(openssl enc -d -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out - | xz -d 2>/dev/null || echo "NO DATA FOUND ($?)" 1>&2)

‎ruptimed

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ else
1717
fi
1818

1919
if [ -f /etc/ruptime/ruptime.key ]; then
20-
KEY="/etc/ruptime/ruptime.key"
20+
export KEY=$(cat /etc/ruptime/ruptime.key)
2121
else
2222
defaults read ch.aiei.ruptime 2>/dev/null >/dev/null
2323
if [ ! $? = 0 ]; then
2424
echo "NO KEY FOUND in /etc/ruptime/ruptime.key"; exit 1
2525
else
2626
#echo "FOUND defaults";
27-
KEY=$(defaults read ch.aiei.ruptime KEY)
27+
export KEY=$(defaults read ch.aiei.ruptime KEY)
2828
fi
2929
fi
3030

@@ -45,18 +45,18 @@ if [ "${ARG}x" = "x" ]; then
4545
# only query command, deliver results asked for
4646
if [ $CMD = "xz.ruptime" ]; then
4747
(find $SPOOL/ -name "*.ruptime" -mmin +10 -exec cat {} \; |sed "s,up.*,down,g";
48-
find $SPOOL/ -name "*.ruptime" -mmin -10 -exec cat {} \; |sort) | xz -c | mcrypt -f $KEY -Fq | base64 -w0
48+
find $SPOOL/ -name "*.ruptime" -mmin -10 -exec cat {} \; |sort) | xz -c | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -
4949
fi
5050
for a in runame rload rnet rsw rboot rbench rhw rdisk rac rwho; do
5151
if [ $CMD = "xz.$a" ]; then
52-
(find $SPOOL/ -name "*.$a" -exec cat {} \; |sort) | xz -c | mcrypt -f $KEY -Fq | base64 -w0
52+
(find $SPOOL/ -name "*.$a" -exec cat {} \; |sort) | xz -c | openssl enc -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out -
5353
fi
5454
done
5555
else
5656
# update/add entry
5757
for a in ruptime runame rload rnet rsw rboot rbench rhw rdisk rac rwho; do
5858
if [ $CMD = "$a" ]; then
59-
echo "$ARG" | base64 -d | mcrypt -d -f $KEY -Fq > "$SPOOL/${h}.${CMD}"
59+
echo "$ARG" | openssl enc -d -A -a -aes-192-cbc -pbkdf2 -pass env:KEY -in - -out - > "$SPOOL/${h}.${CMD}"
6060
fi
6161
done
6262
fi

0 commit comments

Comments
 (0)