- (stevesk) use X/Open socket interface for HP-UX 10.X also

[openssh.git] / cipher.h

diff --git a/cipher.h b/cipher.h
index 0223ace3fe919b2c3e6400190950148ae7c6e1b5..2ad4979c27209e19c0546ee66be5366b00e3dd70 100644 (file)
--- a/cipher.h
+++ b/cipher.h
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* RCSID("$OpenBSD: cipher.h,v 1.23 2000/12/06 23:05:42 markus Exp $"); */
+/* RCSID("$OpenBSD: cipher.h,v 1.26 2001/05/28 22:51:11 markus Exp $"); */
 
 #ifndef CIPHER_H
 #define CIPHER_H
@@ -41,9 +41,7 @@
 #include <openssl/blowfish.h>
 #include <openssl/rc4.h>
 #include <openssl/cast.h>
-
 #include "rijndael.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.
@@ -73,8 +71,9 @@ struct CipherContext {
                struct {
                        des_key_schedule key1;
                        des_key_schedule key2;
-                       des_cblock iv2;
                        des_key_schedule key3;
+                       des_cblock iv1;
+                       des_cblock iv2;
                        des_cblock iv3;
                }       des3;
                struct {
@@ -86,9 +85,9 @@ struct CipherContext {
                        u_char iv[8];
                } cast;
                struct {
-                       u_char iv[16];
-                       rijndael_key enc;
-                       rijndael_key dec;
+                       u4byte iv[4];
+                       rijndael_ctx enc;
+                       rijndael_ctx dec;
                } rijndael;
                RC4_KEY rc4;
        }       u;
@@ -105,7 +104,7 @@ struct Cipher {
        void    (*decrypt)(CipherContext *, u_char *, const u_char *, u_int);
 };
 
-unsigned int cipher_mask_ssh1(int client);
+u_int cipher_mask_ssh1(int client);
 Cipher *cipher_by_name(const char *name);
 Cipher *cipher_by_number(int id);
 int cipher_number(const char *name);