Merge branch 'yilmi-patch-2'

This commit is contained in:
Andrew David Wong 2018-05-24 19:57:34 -05:00
commit 8e5320f7d6
No known key found for this signature in database
GPG Key ID: 8CE137352A019A17

View File

@ -47,8 +47,9 @@ The Qubes backup system has been designed with emergency disaster recovery in mi
4. Verify integrity of `backup-header`. For compatibility reasons `backup-header.hmac` is in fact is an encrypted *and integrity protected* version of `backup-header`. 4. Verify integrity of `backup-header`. For compatibility reasons `backup-header.hmac` is in fact is an encrypted *and integrity protected* version of `backup-header`.
[user@restore ~]$ set +H
[user@restore ~]$ echo "backup-header!$backup_pass" |\ [user@restore ~]$ echo "backup-header!$backup_pass" |\
scrypt -P dec backup-header.hmac backup-header.verified && \ scrypt dec -P backup-header.hmac backup-header.verified && \
diff -qs backup-header backup-header.verified diff -qs backup-header backup-header.verified
Files backup-header and backup-header.verified are identical Files backup-header and backup-header.verified are identical
@ -73,7 +74,7 @@ Recovery - format version 3](/doc/backup-emergency-restore-v3/)
[user@restore ~]$ backup_id=20161020T123455-1234 # see backup-header above [user@restore ~]$ backup_id=20161020T123455-1234 # see backup-header above
[user@restore ~]$ for f_enc in vm1/private.img.???.enc; do \ [user@restore ~]$ for f_enc in vm1/private.img.???.enc; do \
f_dec=${f_enc%.enc}; \ f_dec=${f_enc%.enc}; \
echo "$backup_id!$f_dec!$backup_pass" | scrypt -P dec $f_enc $f_dec || break; \ echo "$backup_id!$f_dec!$backup_pass" | scrypt dec -P $f_enc $f_dec || break; \
done done
**Note:** If the above fail, most likely your backup is corrupted, or been tampered with. **Note:** If the above fail, most likely your backup is corrupted, or been tampered with.