mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-18 08:04:40 +00:00
0fde8acdad
[Makefile.in PROTOCOL PROTOCOL.chacha20poly1305 authfile.c chacha.c] [chacha.h cipher-chachapoly.c cipher-chachapoly.h cipher.c cipher.h] [dh.c myproposal.h packet.c poly1305.c poly1305.h servconf.c ssh.1] [ssh.c ssh_config.5 sshd_config.5] Add a new protocol 2 transport cipher "chacha20-poly1305@openssh.com" that combines Daniel Bernstein's ChaCha20 stream cipher and Poly1305 MAC to build an authenticated encryption mode. Inspired by and similar to Adam Langley's proposal for TLS: http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-03 but differs in layout used for the MAC calculation and the use of a second ChaCha20 instance to separately encrypt packet lengths. Details are in the PROTOCOL.chacha20poly1305 file. Feedback markus@, naddy@; manpage bits Loganden Velvindron @ AfriNIC ok markus@ naddy@
103 lines
4.0 KiB
C
103 lines
4.0 KiB
C
/* $OpenBSD: cipher.h,v 1.42 2013/11/21 00:45:44 djm Exp $ */
|
|
|
|
/*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
* All rights reserved
|
|
*
|
|
* As far as I am concerned, the code I have written for this software
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
* software must be clearly marked as such, and if the derived work is
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
* called by a name other than "ssh" or "Secure Shell".
|
|
*
|
|
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef CIPHER_H
|
|
#define CIPHER_H
|
|
|
|
#include <openssl/evp.h>
|
|
#include "cipher-chachapoly.h"
|
|
|
|
/*
|
|
* Cipher types for SSH-1. New types can be added, but old types should not
|
|
* be removed for compatibility. The maximum allowed value is 31.
|
|
*/
|
|
#define SSH_CIPHER_SSH2 -3
|
|
#define SSH_CIPHER_INVALID -2 /* No valid cipher selected. */
|
|
#define SSH_CIPHER_NOT_SET -1 /* None selected (invalid number). */
|
|
#define SSH_CIPHER_NONE 0 /* no encryption */
|
|
#define SSH_CIPHER_IDEA 1 /* IDEA CFB */
|
|
#define SSH_CIPHER_DES 2 /* DES CBC */
|
|
#define SSH_CIPHER_3DES 3 /* 3DES CBC */
|
|
#define SSH_CIPHER_BROKEN_TSS 4 /* TRI's Simple Stream encryption CBC */
|
|
#define SSH_CIPHER_BROKEN_RC4 5 /* Alleged RC4 */
|
|
#define SSH_CIPHER_BLOWFISH 6
|
|
#define SSH_CIPHER_RESERVED 7
|
|
#define SSH_CIPHER_MAX 31
|
|
|
|
#define CIPHER_ENCRYPT 1
|
|
#define CIPHER_DECRYPT 0
|
|
|
|
typedef struct Cipher Cipher;
|
|
typedef struct CipherContext CipherContext;
|
|
|
|
struct Cipher;
|
|
struct CipherContext {
|
|
int plaintext;
|
|
int encrypt;
|
|
EVP_CIPHER_CTX evp;
|
|
struct chachapoly_ctx cp_ctx; /* XXX union with evp? */
|
|
const Cipher *cipher;
|
|
};
|
|
|
|
u_int cipher_mask_ssh1(int);
|
|
const Cipher *cipher_by_name(const char *);
|
|
const Cipher *cipher_by_number(int);
|
|
int cipher_number(const char *);
|
|
char *cipher_name(int);
|
|
int ciphers_valid(const char *);
|
|
char *cipher_alg_list(char, int);
|
|
void cipher_init(CipherContext *, const Cipher *, const u_char *, u_int,
|
|
const u_char *, u_int, int);
|
|
void cipher_crypt(CipherContext *, u_int, u_char *, const u_char *,
|
|
u_int, u_int, u_int);
|
|
int cipher_get_length(CipherContext *, u_int *, u_int,
|
|
const u_char *, u_int);
|
|
void cipher_cleanup(CipherContext *);
|
|
void cipher_set_key_string(CipherContext *, const Cipher *, const char *, int);
|
|
u_int cipher_blocksize(const Cipher *);
|
|
u_int cipher_keylen(const Cipher *);
|
|
u_int cipher_authlen(const Cipher *);
|
|
u_int cipher_ivlen(const Cipher *);
|
|
u_int cipher_is_cbc(const Cipher *);
|
|
|
|
u_int cipher_get_number(const Cipher *);
|
|
void cipher_get_keyiv(CipherContext *, u_char *, u_int);
|
|
void cipher_set_keyiv(CipherContext *, u_char *);
|
|
int cipher_get_keyiv_len(const CipherContext *);
|
|
int cipher_get_keycontext(const CipherContext *, u_char *);
|
|
void cipher_set_keycontext(CipherContext *, u_char *);
|
|
#endif /* CIPHER_H */
|