--- rsaref/source/des.h	2018/04/24 16:37:52	1.1.1.1
+++ rsaref/source/des.h	2018/04/24 16:38:17	1.1.1.2
@@ -1,20 +1,56 @@
 /* DES.H - header file for DESC.C
  */
 
-/* Copyright (C) 1991-2 RSA Laboratories, a division of RSA Data
-   Security, Inc. All rights reserved.
- */
+#ifndef _DES_H_
+#define _DES_H_ 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-/* DES-CBC context.
- */
 typedef struct {
-  unsigned char subkeyBit[16][48];                               /* subkeys */
-  unsigned char ivBit[64];                           /* initializing vector */
-  int encrypt;                                              /* encrypt flag */
+  UINT4 subkeys[32];                                             /* subkeys */
+  UINT4 iv[2];                                       /* initializing vector */
+  UINT4 originalIV[2];                        /* for restarting the context */
+  int encrypt;                                               /* encrypt flag */
 } DES_CBC_CTX;
 
+typedef struct {
+  UINT4 subkeys[32];                                             /* subkeys */
+  UINT4 iv[2];                                       /* initializing vector */
+  UINT4 inputWhitener[2];                                 /* input whitener */
+  UINT4 outputWhitener[2];                               /* output whitener */
+  UINT4 originalIV[2];                        /* for restarting the context */
+  int encrypt;                                              /* encrypt flag */
+} DESX_CBC_CTX;
+
+typedef struct {
+  UINT4 subkeys[3][32];                     /* subkeys for three operations */
+  UINT4 iv[2];                                       /* initializing vector */
+  UINT4 originalIV[2];                        /* for restarting the context */
+  int encrypt;                                              /* encrypt flag */
+} DES3_CBC_CTX;
+
 void DES_CBCInit PROTO_LIST 
   ((DES_CBC_CTX *, unsigned char *, unsigned char *, int));
 int DES_CBCUpdate PROTO_LIST
   ((DES_CBC_CTX *, unsigned char *, unsigned char *, unsigned int));
-void DES_CBCFinal PROTO_LIST ((DES_CBC_CTX *));
+void DES_CBCRestart PROTO_LIST ((DES_CBC_CTX *));
+
+void DESX_CBCInit PROTO_LIST 
+  ((DESX_CBC_CTX *, unsigned char *, unsigned char *, int));
+int DESX_CBCUpdate PROTO_LIST
+  ((DESX_CBC_CTX *, unsigned char *, unsigned char *, unsigned int));
+void DESX_CBCRestart PROTO_LIST ((DESX_CBC_CTX *));
+
+void DES3_CBCInit PROTO_LIST 
+  ((DES3_CBC_CTX *, unsigned char *, unsigned char *, int));
+int DES3_CBCUpdate PROTO_LIST
+  ((DES3_CBC_CTX *, unsigned char *, unsigned char *, unsigned int));
+void DES3_CBCRestart PROTO_LIST ((DES3_CBC_CTX *));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif