- Timestamp:
- Feb 1, 2019, 8:12:49 PM (5 years ago)
- Branches:
- master
- Children:
- 238c3a5
- Parents:
- 9e596f5
- git-author:
- Anders Kaseorg <andersk@mit.edu> (02/01/19 19:58:44)
- git-committer:
- Anders Kaseorg <andersk@mit.edu> (02/01/19 20:12:49)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
zcrypt.c
rca1fb26a r396dc2c 790 790 char *out; 791 791 int err, status; 792 int tried_gpg1 = FALSE; 792 793 const char *argv[] = { 793 "gpg ",794 "gpg1", 794 795 "--symmetric", 795 796 "--no-options", … … 805 806 NULL 806 807 }; 807 err = call_filter(argv, in, &out, &status); 808 while ((err = call_filter(argv, in, &out, &status)) && !out && !tried_gpg1) { 809 tried_gpg1 = TRUE; 810 argv[0] = "gpg"; 811 } 808 812 if(err || status) { 809 813 g_free(out); … … 874 878 char *in, *out; 875 879 int length; 880 int tried_gpg1 = FALSE; 876 881 const char *argv[] = { 877 "gpg ",882 "gpg1", 878 883 "--decrypt", 879 884 "--no-options", … … 892 897 if(!in) return FALSE; 893 898 894 err = call_filter(argv, in, &out, &status); 899 while ((err = call_filter(argv, in, &out, &status)) && !out && !tried_gpg1) { 900 tried_gpg1 = TRUE; 901 argv[0] = "gpg"; 902 } 895 903 free(in); 896 904 if(err || status) {
Note: See TracChangeset
for help on using the changeset viewer.