diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/pubkey-enc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c index 67bb50994..f11e6f12a 100644 --- a/g10/pubkey-enc.c +++ b/g10/pubkey-enc.c @@ -51,7 +51,7 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek ) if( is_RSA(k->pubkey_algo) ) /* warn about that */ write_status(STATUS_RSA_OR_IDEA); - rc = check_pubkey_algo( k->pubkey_algo ); + rc = openpgp_pk_test_algo( k->pubkey_algo, 0 ); if( rc ) goto leave; @@ -149,7 +149,7 @@ get_it( PKT_pubkey_enc *k, DEK *dek, PKT_secret_key *sk, u32 *keyid ) dek->keylen = nframe - (n+1) - 2; dek->algo = frame[n++]; - if( dek->algo == CIPHER_ALGO_IDEA ) + if( dek->algo == GCRY_CIPHER_IDEA ) write_status(STATUS_RSA_OR_IDEA); rc = openpgp_cipher_test_algo( dek->algo ); if( rc ) { @@ -180,14 +180,14 @@ get_it( PKT_pubkey_enc *k, DEK *dek, PKT_secret_key *sk, u32 *keyid ) log_error("public key problem: %s\n", g10_errstr(rc) ); else if( !pk->local_id && query_trust_record(pk) ) log_error("can't check algorithm against preferences\n"); - else if( dek->algo != CIPHER_ALGO_3DES + else if( dek->algo != GCRY_CIPHER_3DES && !is_algo_in_prefs( pk->local_id, PREFTYPE_SYM, dek->algo ) ) { /* Don't print a note while we are not on verbose mode, * the cipher is blowfish and the preferences have twofish * listed */ - if( opt.verbose || dek->algo != CIPHER_ALGO_BLOWFISH + if( opt.verbose || dek->algo != GCRY_CIPHER_BLOWFISH || !is_algo_in_prefs( pk->local_id, PREFTYPE_SYM, - CIPHER_ALGO_TWOFISH ) ) + GCRY_CIPHER_TWOFISH ) ) log_info(_( "NOTE: cipher algorithm %d not found in preferences\n"), dek->algo ); |