From 0c378ff6d98d80bc465a4a6a787670fb9cc701ee Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Thu, 4 May 2017 01:33:21 +0000 Subject: upstream commit another tentacle: cipher_set_key_string() was only ever used for SSHv1 Upstream-ID: 7fd31eb6c48946f7e7cc12af0699fe8eb637e94a --- cipher.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'cipher.c') diff --git a/cipher.c b/cipher.c index 7d72084ff..9e26b96b8 100644 --- a/cipher.c +++ b/cipher.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.c,v 1.105 2017/05/01 00:03:18 djm Exp $ */ +/* $OpenBSD: cipher.c,v 1.106 2017/05/04 01:33:21 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -455,28 +455,6 @@ cipher_free(struct sshcipher_ctx *cc) free(cc); } -/* - * Selects the cipher, and keys if by computing the MD5 checksum of the - * passphrase and using the resulting 16 bytes as the key. - */ -int -cipher_set_key_string(struct sshcipher_ctx **ccp, - const struct sshcipher *cipher, const char *passphrase, int do_encrypt) -{ - u_char digest[16]; - int r = SSH_ERR_INTERNAL_ERROR; - - if ((r = ssh_digest_memory(SSH_DIGEST_MD5, - passphrase, strlen(passphrase), - digest, sizeof(digest))) != 0) - goto out; - - r = cipher_init(ccp, cipher, digest, 16, NULL, 0, do_encrypt); - out: - explicit_bzero(digest, sizeof(digest)); - return r; -} - /* * Exports an IV from the sshcipher_ctx required to export the key * state back from the unprivileged child to the privileged parent -- cgit v1.2.3