openbsd/libopenssh
1
0
Fork 0
mirror of https://github.com/openssh/libopenssh synced 2026-04-22 20:56:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace Cipher typedef with 'struct sshcipher'

Browse Source
This commit is contained in:
Markus Friedl
2012-10-12 17:58:02 +02:00
parent 7e29b55734
commit 337493a508
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ssh/authfile.c
View File

@@ -84,7 +84,7 @@ sshkey_private_rsa1_to_blob(struct sshkey *key, struct sshbuf *blob,
u_char buf[8];
int r, cipher_num;
CipherContext ciphercontext;
Cipher *cipher;
struct sshcipher *cipher;
u_char *cp;
/*
@@ -422,7 +422,7 @@ sshkey_parse_private_rsa1(struct sshbuf *blob, const char *passphrase,
u_char *cp;
char *comment = NULL;
CipherContext ciphercontext;
Cipher *cipher;
struct sshcipher *cipher;
struct sshkey *prv = NULL;
*keyp = NULL;

3
ssh/cipher.h
View File

@@ -60,14 +60,13 @@
#define CIPHER_ENCRYPT 1
#define CIPHER_DECRYPT 0
typedef struct sshcipher Cipher;
typedef struct sshcipher_ctx CipherContext;
struct sshcipher;
struct sshcipher_ctx {
int plaintext;
EVP_CIPHER_CTX evp;
Cipher *cipher;
struct sshcipher *cipher;
};
u_int cipher_mask_ssh1(int);

2
ssh/kex.h
View File

@@ -81,7 +81,7 @@ enum kex_exchange {
struct sshenc {
char *name;
Cipher *cipher;
struct sshcipher *cipher;
int enabled;
u_int key_len;
u_int block_size;

4
ssh/packet.c
View File

@@ -266,7 +266,7 @@ struct ssh *
ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
{
struct session_state *state;
Cipher *none = cipher_by_name("none");
struct sshcipher *none = cipher_by_name("none");
int r;
if (none == NULL)
@@ -774,7 +774,7 @@ void
ssh_packet_set_encryption_key(struct ssh *ssh, const u_char *key, u_int keylen, int number)
{
struct session_state *state = ssh->state;
Cipher *cipher = cipher_by_number(number);
struct sshcipher *cipher = cipher_by_number(number);
int r;
const char *wmsg;