diff options
author | Damien Miller <djm@mindrot.org> | 2013-12-07 10:41:55 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-12-07 10:41:55 +1100 |
commit | bcd00abd8451f36142ae2ee10cc657202149201e (patch) | |
tree | 946db23f1ec607d9260e46b9f6f2422e0e9c970c /ssh-agent.c | |
parent | f0e9060d236c0e38bec2fa1c6579fb0a2ea6458d (diff) |
- markus@cvs.openbsd.org 2013/12/06 13:34:54
[authfile.c authfile.h cipher.c cipher.h key.c packet.c ssh-agent.c]
[ssh-keygen.c PROTOCOL.key] new private key format, bcrypt as KDF by
default; details in PROTOCOL.key; feedback and lots help from djm;
ok djm@
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 0196f8f6b..579ee3840 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.178 2013/12/06 13:30:08 markus Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.179 2013/12/06 13:34:54 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -484,7 +484,6 @@ process_add_identity(SocketEntry *e, int version) | |||
484 | /* Generate additional parameters */ | 484 | /* Generate additional parameters */ |
485 | rsa_generate_additional_parameters(k->rsa); | 485 | rsa_generate_additional_parameters(k->rsa); |
486 | 486 | ||
487 | /* enable blinding */ | ||
488 | if (RSA_blinding_on(k->rsa, NULL) != 1) { | 487 | if (RSA_blinding_on(k->rsa, NULL) != 1) { |
489 | error("process_add_identity: RSA_blinding_on failed"); | 488 | error("process_add_identity: RSA_blinding_on failed"); |
490 | key_free(k); | 489 | key_free(k); |