upstream commit

another tentacle: cipher_set_key_string() was only ever
used for SSHv1

Upstream-ID: 7fd31eb6c48946f7e7cc12af0699fe8eb637e94a

diff --git a/cipher.c b/cipher.c
index 7d72084ff5c954d2a935ad2a0665e951b2691c1b..9e26b96b8c015bb63f6b4ba69cb77597107049bd 100644 (file)
--- 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 <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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

diff --git a/cipher.h b/cipher.h
index 312bbc8a0faedc511538cd72a9605555069afd9d..f9ac151f71a938bce85693c48d950710322021da 100644 (file)
--- a/cipher.h
+++ b/cipher.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.h,v 1.50 2017/04/30 23:15:04 djm Exp $ */
+/* $OpenBSD: cipher.h,v 1.51 2017/05/04 01:33:21 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -59,8 +59,6 @@ int    cipher_crypt(struct sshcipher_ctx *, u_int, u_char *, const u_char *,
 int     cipher_get_length(struct sshcipher_ctx *, u_int *, u_int,
     const u_char *, u_int);
 void    cipher_free(struct sshcipher_ctx *);
-int     cipher_set_key_string(struct sshcipher_ctx **,
-    const struct sshcipher *, const char *, int);
 u_int   cipher_blocksize(const struct sshcipher *);
 u_int   cipher_keylen(const struct sshcipher *);
 u_int   cipher_seclen(const struct sshcipher *);