- (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 97bc8891fbc1e91a4a5dde0b9d38691134d55fc3..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.22 2000/10/13 18:59:14 markus Exp $"); */
+/* RCSID("$OpenBSD: cipher.h,v 1.26 2001/05/28 22:51:11 markus Exp $"); */
 
 #ifndef CIPHER_H
 #define CIPHER_H
@@ -71,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 {
@@ -103,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);