summaryrefslogtreecommitdiff
path: root/cipher.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-04-06 12:32:37 +1000
committerDamien Miller <djm@mindrot.org>2000-04-06 12:32:37 +1000
commit1383bd8eb91a8ec9c8d283679faec5925b0ccc42 (patch)
treef71278df6c50983ea3dad850ae79c45c340d9362 /cipher.h
parent74a333bbe11f67c59c559e0f424d5945eb438577 (diff)
- OpenBSD CVS update:
- [channels.c] close efd on eof - [clientloop.c compat.c ssh.c sshconnect.c myproposal.h] ssh2 client implementation, interops w/ ssh.com and lsh servers. - [sshconnect.c] missing free. - [authfile.c cipher.c cipher.h packet.c sshconnect.c sshd.c] remove unused argument, split cipher_mask() - [clientloop.c] re-order: group ssh1 vs. ssh2 - Make Redhat spec require openssl >= 0.9.5a
Diffstat (limited to 'cipher.h')
-rw-r--r--cipher.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/cipher.h b/cipher.h
index 6cfeb6399..94c0ceee5 100644
--- a/cipher.h
+++ b/cipher.h
@@ -11,7 +11,7 @@
11 * 11 *
12 */ 12 */
13 13
14/* RCSID("$Id: cipher.h,v 1.7 2000/04/01 01:09:23 damien Exp $"); */ 14/* RCSID("$Id: cipher.h,v 1.8 2000/04/06 02:32:39 damien Exp $"); */
15 15
16#ifndef CIPHER_H 16#ifndef CIPHER_H
17#define CIPHER_H 17#define CIPHER_H
@@ -76,6 +76,8 @@ typedef struct {
76 * supported cipher. 76 * supported cipher.
77 */ 77 */
78unsigned int cipher_mask(); 78unsigned int cipher_mask();
79unsigned int cipher_mask1();
80unsigned int cipher_mask2();
79 81
80/* Returns the name of the cipher. */ 82/* Returns the name of the cipher. */
81const char *cipher_name(int cipher); 83const char *cipher_name(int cipher);
@@ -92,7 +94,7 @@ int cipher_number(const char *name);
92 */ 94 */
93void 95void
94cipher_set_key(CipherContext * context, int cipher, 96cipher_set_key(CipherContext * context, int cipher,
95 const unsigned char *key, int keylen, int for_encryption); 97 const unsigned char *key, int keylen);
96void 98void
97cipher_set_key_iv(CipherContext * context, int cipher, 99cipher_set_key_iv(CipherContext * context, int cipher,
98 const unsigned char *key, int keylen, 100 const unsigned char *key, int keylen,
@@ -104,7 +106,7 @@ cipher_set_key_iv(CipherContext * context, int cipher,
104 */ 106 */
105void 107void
106cipher_set_key_string(CipherContext * context, int cipher, 108cipher_set_key_string(CipherContext * context, int cipher,
107 const char *passphrase, int for_encryption); 109 const char *passphrase);
108 110
109/* Encrypts data using the cipher. */ 111/* Encrypts data using the cipher. */
110void 112void