summaryrefslogtreecommitdiff
path: root/cipher.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-07 10:06:42 +0100
committerColin Watson <cjwatson@debian.org>2013-05-07 10:06:42 +0100
commitecebda56da46a03dafff923d91c382f31faa9eec (patch)
tree449614b6c06a2622c74a609b31fcc46c60037c56 /cipher.h
parentc6a2c0334e45419875687d250aed9bea78480f2e (diff)
parentffc06452028ba78cd693d4ed43df8b60a10d6163 (diff)
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'cipher.h')
-rw-r--r--cipher.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/cipher.h b/cipher.h
index 3dd2270bb..8cb57c3e5 100644
--- a/cipher.h
+++ b/cipher.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: cipher.h,v 1.37 2009/01/26 09:58:15 markus Exp $ */ 1/* $OpenBSD: cipher.h,v 1.39 2013/01/08 18:49:04 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -64,6 +64,7 @@ typedef struct CipherContext CipherContext;
64struct Cipher; 64struct Cipher;
65struct CipherContext { 65struct CipherContext {
66 int plaintext; 66 int plaintext;
67 int encrypt;
67 EVP_CIPHER_CTX evp; 68 EVP_CIPHER_CTX evp;
68 Cipher *cipher; 69 Cipher *cipher;
69}; 70};
@@ -76,11 +77,14 @@ char *cipher_name(int);
76int ciphers_valid(const char *); 77int ciphers_valid(const char *);
77void cipher_init(CipherContext *, Cipher *, const u_char *, u_int, 78void cipher_init(CipherContext *, Cipher *, const u_char *, u_int,
78 const u_char *, u_int, int); 79 const u_char *, u_int, int);
79void cipher_crypt(CipherContext *, u_char *, const u_char *, u_int); 80void cipher_crypt(CipherContext *, u_char *, const u_char *,
81 u_int, u_int, u_int);
80void cipher_cleanup(CipherContext *); 82void cipher_cleanup(CipherContext *);
81void cipher_set_key_string(CipherContext *, Cipher *, const char *, int); 83void cipher_set_key_string(CipherContext *, Cipher *, const char *, int);
82u_int cipher_blocksize(const Cipher *); 84u_int cipher_blocksize(const Cipher *);
83u_int cipher_keylen(const Cipher *); 85u_int cipher_keylen(const Cipher *);
86u_int cipher_authlen(const Cipher *);
87u_int cipher_ivlen(const Cipher *);
84u_int cipher_is_cbc(const Cipher *); 88u_int cipher_is_cbc(const Cipher *);
85 89
86u_int cipher_get_number(const Cipher *); 90u_int cipher_get_number(const Cipher *);