summaryrefslogtreecommitdiff
path: root/cipher.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-16 13:37:16 +1100
committerDamien Miller <djm@mindrot.org>1999-11-16 13:37:16 +1100
commit7e8e820153a620ab1dcd81857a7de0969c41d043 (patch)
tree226cc4185feae97f4069ad60b4c18d259aa5df2f /cipher.c
parent4874c79a3a05fc18678d7a85d7091f5139630fac (diff)
- Merged OpenBSD CVS changes:
- [auth-rh-rsa.c auth-rsa.c authfd.c authfd.h hostfile.c mpaux.c] [mpaux.h ssh-add.c ssh-agent.c ssh.h ssh.c sshd.c] the keysize of rsa-parameter 'n' is passed implizit, a few more checks and warnings about 'pretended' keysizes. - [cipher.c cipher.h packet.c packet.h sshd.c] remove support for cipher RC4 - [ssh.c] a note for legay systems about secuity issues with permanently_set_uid(), the private hostkey and ptrace() - [sshconnect.c] more detailed messages about adding and checking hostkeys
Diffstat (limited to 'cipher.c')
-rw-r--r--cipher.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cipher.c b/cipher.c
index 32b5ecb63..a33188e46 100644
--- a/cipher.c
+++ b/cipher.c
@@ -12,7 +12,7 @@ Created: Wed Apr 19 17:41:39 1995 ylo
12*/ 12*/
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$Id: cipher.c,v 1.5 1999/11/12 23:51:58 damien Exp $"); 15RCSID("$Id: cipher.c,v 1.6 1999/11/16 02:37:16 damien Exp $");
16 16
17#include "ssh.h" 17#include "ssh.h"
18#include "cipher.h" 18#include "cipher.h"
@@ -235,7 +235,7 @@ void cipher_set_key(CipherContext *context, int cipher,
235 break; 235 break;
236 236
237 default: 237 default:
238 fatal("cipher_set_key: unknown cipher: %d", cipher); 238 fatal("cipher_set_key: unknown cipher: %s", cipher_name(cipher));
239 } 239 }
240 memset(padded, 0, sizeof(padded)); 240 memset(padded, 0, sizeof(padded));
241} 241}