summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/cipher.h
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2002-06-23 16:09:08 +0000
committerdes <des@FreeBSD.org>2002-06-23 16:09:08 +0000
commitfa8aa6dfe7e9aaab9f8fa1e3290e7242fc12d83d (patch)
treecc93abce4a81ab84afa26d861b756d5c77818afa /crypto/openssh/cipher.h
parente9f3540c66a76052e51a348bdd05a068d0855d3d (diff)
downloadFreeBSD-src-fa8aa6dfe7e9aaab9f8fa1e3290e7242fc12d83d.zip
FreeBSD-src-fa8aa6dfe7e9aaab9f8fa1e3290e7242fc12d83d.tar.gz
Resolve conflicts. Known issues:
- sshd fails to set TERM correctly. - privilege separation may break PAM and is currently turned off. - man pages have not yet been updated I will have these issues resolved, and privilege separation turned on by default, in time for DP2. Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'crypto/openssh/cipher.h')
-rw-r--r--crypto/openssh/cipher.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/openssh/cipher.h b/crypto/openssh/cipher.h
index 8aa5982..3847bda 100644
--- a/crypto/openssh/cipher.h
+++ b/crypto/openssh/cipher.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.h,v 1.32 2002/03/04 17:27:39 stevesk Exp $ */
+/* $OpenBSD: cipher.h,v 1.33 2002/03/18 17:13:15 markus Exp $ */
/* $FreeBSD$ */
/*
@@ -82,4 +82,11 @@ void cipher_cleanup(CipherContext *);
void cipher_set_key_string(CipherContext *, Cipher *, const char *, int);
u_int cipher_blocksize(Cipher *);
u_int cipher_keylen(Cipher *);
+
+u_int cipher_get_number(Cipher *);
+void cipher_get_keyiv(CipherContext *, u_char *, u_int);
+void cipher_set_keyiv(CipherContext *, u_char *);
+int cipher_get_keyiv_len(CipherContext *);
+int cipher_get_keycontext(CipherContext *, u_char *);
+void cipher_set_keycontext(CipherContext *, u_char *);
#endif /* CIPHER_H */
OpenPOWER on IntegriCloud