aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/des
diff options
context:
space:
mode:
authorUlf Möller <ulf@openssl.org>1999-07-28 23:25:59 +0000
committerUlf Möller <ulf@openssl.org>1999-07-28 23:25:59 +0000
commit8c197cc55eda97fba9c51254fd0e1da7259ab174 (patch)
tree06dce59bd50795c2f822df8d3ec26a15e6eb7919 /crypto/des
parent3e3d2ea2fc9e9b702f94d5870f1a0a2f0c4c59f5 (diff)
downloadopenssl-8c197cc55eda97fba9c51254fd0e1da7259ab174.tar.gz
VMS updates.
Submitted by: Richard Levitte <levitte@stacken.kth.se>
Diffstat (limited to 'crypto/des')
-rw-r--r--crypto/des/des-lib.com4
-rw-r--r--crypto/des/des.h6
2 files changed, 8 insertions, 2 deletions
diff --git a/crypto/des/des-lib.com b/crypto/des/des-lib.com
index 40a34bb0dd..2aea7a0dea 100644
--- a/crypto/des/des-lib.com
+++ b/crypto/des/des-lib.com
@@ -430,11 +430,13 @@ $!
$! Compile The DES Program.
$!
$ CC/OBJECT='OBJ_DIR'DES.OBJ SYS$DISK:[]DES.C
+$ CC/OBJECT='OBJ_DIR'DES.OBJ SYS$DISK:[]CBC3_ENC.C
$!
$! Link The DES Program.
$!
$ LINK/'DEBUGGER'/'TRACEBACK'/CONTIGUOUS/EXE='EXE_DIR'DES.EXE -
- 'OBJ_DIR'DES.OBJ,'LIB_NAME'/LIBRARY,'OPT_FILE'/OPTION
+ 'OBJ_DIR'DES.OBJ,'OBJ_DIR'CBC3_ENC.OBJ,-
+ 'LIB_NAME'/LIBRARY,'OPT_FILE'/OPTION
$!
$! All Done, Time To Return.
$!
diff --git a/crypto/des/des.h b/crypto/des/des.h
index 141526ba05..54d58ed602 100644
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -67,6 +67,10 @@ extern "C" {
#error DES is disabled.
#endif
+#ifdef _KERBEROS_DES_H
+#error kerberos/des.h and openssl/des.h
+#endif
+
#include <stdio.h>
#include <openssl/opensslconf.h> /* DES_LONG */
#include <openssl/e_os2.h> /* OPENSSL_EXTERN */
@@ -116,11 +120,11 @@ typedef struct des_ks_struct
#define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-#define Key_schedule des_key_schedule
#ifdef KERBEROS
#define ENCRYPT DES_ENCRYPT
#define DECRYPT DES_DECRYPT
#endif
+
#define KEY_SZ DES_KEY_SZ
#define string_to_key des_string_to_key
#define read_pw_string des_read_pw_string