diff options
| author | Werner Koch <[email protected]> | 2005-02-23 21:06:32 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-02-23 21:06:32 +0000 |
| commit | 4e5bf2fd93a175f64aa1ca2e4b35dcf853f7f828 (patch) | |
| tree | d00f3064beafb27e942d990ebd4fb2a16a0e1ccd /agent/protect.c | |
| parent | (stream_read_string): Removed call to abort on (diff) | |
| download | gnupg-4e5bf2fd93a175f64aa1ca2e4b35dcf853f7f828.tar.gz gnupg-4e5bf2fd93a175f64aa1ca2e4b35dcf853f7f828.zip | |
* command-ssh.c (get_passphrase): Removed.
(ssh_identity_register): Partly rewritten.
(open_control_file, search_control_file, add_control_entry): New.
(ssh_handler_request_identities): Return only files listed in our
control file.
* findkey.c (unprotect): Check for allocation error.
* agent.h (opt): Add fields to record the startup terminal
settings.
* gpg-agent.c (main): Record them and do not force keep display
with --enable-ssh-support.
* command-ssh.c (start_command_handler_ssh): Use them here.
* gpg-agent.c: Renamed option --ssh-support to
--enable-ssh-support.
* command.c (cmd_readkey): New.
(register_commands): Register new command "READKEY".
* command-ssh.c (ssh_request_process): Improved logging.
* findkey.c (agent_write_private_key): Always use plain open.
Don't depend on an umask for permissions.
(agent_key_from_file): Factored file reading code out to ..
(read_key_file): .. new function.
(agent_public_key_from_file): New.
Diffstat (limited to 'agent/protect.c')
| -rw-r--r-- | agent/protect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/protect.c b/agent/protect.c index edcca36d9..cafeb4685 100644 --- a/agent/protect.c +++ b/agent/protect.c @@ -117,7 +117,7 @@ calculate_mic (const unsigned char *plainkey, unsigned char *sha1hash) /* Encrypt the parameter block starting at PROTBEGIN with length PROTLEN using the utf8 encoded key PASSPHRASE and return the entire - encrypted block in RESULT or ereturn with an error code. SHA1HASH + encrypted block in RESULT or return with an error code. SHA1HASH is the 20 byte SHA-1 hash required for the integrity code. The parameter block is expected to be an incomplete S-Expression of |