diff options
| author | Werner Koch <[email protected]> | 2007-12-12 10:28:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-12-12 10:28:30 +0000 |
| commit | bae4b256c79c24e5306c692adf9bb5891433c7d5 (patch) | |
| tree | c0aae4de008d75964074146240257f81b8ded0b1 /g10/mainproc.c | |
| parent | Allow decryption using type 20 Elgamal keys. (diff) | |
| download | gnupg-bae4b256c79c24e5306c692adf9bb5891433c7d5.tar.gz gnupg-bae4b256c79c24e5306c692adf9bb5891433c7d5.zip | |
Support DSA2.
Support Camellia for testing.
More audit stuff.
Diffstat (limited to 'g10/mainproc.c')
| -rw-r--r-- | g10/mainproc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 10d665b80..3756e2f96 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -274,9 +274,9 @@ proc_symkey_enc( CTX c, PACKET *pkt ) else if(!c->dek) { int algo = enc->cipher_algo; - const char *s = gcry_cipher_algo_name (algo); + const char *s = openpgp_cipher_algo_name (algo); - if (!gcry_cipher_test_algo (algo)) + if (!openpgp_cipher_test_algo (algo)) { if(!opt.quiet) { @@ -524,8 +524,8 @@ proc_encrypted( CTX c, PACKET *pkt ) algo = opt.def_cipher_algo; if ( algo ) log_info (_("assuming %s encrypted data\n"), - gcry_cipher_algo_name (algo)); - else if ( gcry_cipher_test_algo (CIPHER_ALGO_IDEA) ) + openpgp_cipher_algo_name (algo)); + else if ( openpgp_cipher_test_algo (CIPHER_ALGO_IDEA) ) { algo = opt.def_cipher_algo; if (!algo) @@ -533,7 +533,7 @@ proc_encrypted( CTX c, PACKET *pkt ) idea_cipher_warn(1); log_info (_("IDEA cipher unavailable, " "optimistically attempting to use %s instead\n"), - gcry_cipher_algo_name (algo)); + openpgp_cipher_algo_name (algo)); } else { |