diff options
| author | Werner Koch <wk@gnupg.org> | 2009-09-30 17:28:38 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2009-09-30 17:28:38 +0200 |
| commit | 27c1b4bef84dcb3a77147887817f228ced8c1b31 (patch) | |
| tree | 27817fb6ac1ae22d6bba472de9f55e998534c3df /g10/gpg.c | |
| parent | Rename encode.c to encrypt.c. (diff) | |
| download | gnupg2-27c1b4bef84dcb3a77147887817f228ced8c1b31.tar.xz gnupg2-27c1b4bef84dcb3a77147887817f228ced8c1b31.zip | |
Some changes to suport g13.
Diffstat (limited to 'g10/gpg.c')
| -rw-r--r-- | g10/gpg.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1920,9 +1920,6 @@ main (int argc, char **argv) gnupg_rl_initialize (); set_strusage (my_strusage); gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN); - /* We don't need any locking in libgcrypt unless we use any kind of - threading. */ - gcry_control (GCRYCTL_DISABLE_INTERNAL_LOCKING); log_set_prefix ("gpg", 1); /* Make sure that our subsystems are ready. */ @@ -3437,7 +3434,8 @@ main (int argc, char **argv) { if( argc > 1 ) wrong_args(_("--encrypt [filename]")); - if( (rc = encrypt_crypt(fname,remusr,0)) ) + if( (rc = encrypt_crypt (GNUPG_INVALID_FD, fname, + remusr, 0, NULL, GNUPG_INVALID_FD)) ) log_error("%s: encryption failed: %s\n", print_fname_stdin(fname), g10_errstr(rc) ); } @@ -3458,7 +3456,8 @@ main (int argc, char **argv) " while in %s mode\n"),compliance_option_string()); else { - if( (rc = encrypt_crypt(fname,remusr,1)) ) + if( (rc = encrypt_crypt (GNUPG_INVALID_FD, fname, + remusr, 1, NULL, GNUPG_INVALID_FD)) ) log_error("%s: encryption failed: %s\n", print_fname_stdin(fname), g10_errstr(rc) ); } |