diff options
author | djm <> | 2010-10-01 22:54:19 +0000 |
---|---|---|
committer | djm <> | 2010-10-01 22:54:19 +0000 |
commit | 242690ab2a8e991b85b4735c4e0bac0ec7bd3481 (patch) | |
tree | a55c90bd6ea9329d2afb5540220340cadd107178 /src/lib/libcrypto/des | |
parent | 5d1f64994b96668ba794f5211364ed54dd7ee08d (diff) | |
download | openbsd-242690ab2a8e991b85b4735c4e0bac0ec7bd3481.tar.gz openbsd-242690ab2a8e991b85b4735c4e0bac0ec7bd3481.tar.bz2 openbsd-242690ab2a8e991b85b4735c4e0bac0ec7bd3481.zip |
import OpenSSL-1.0.0a
Diffstat (limited to 'src/lib/libcrypto/des')
-rw-r--r-- | src/lib/libcrypto/des/Makefile | 55 | ||||
-rw-r--r-- | src/lib/libcrypto/des/des-lib.com | 66 | ||||
-rw-r--r-- | src/lib/libcrypto/des/rpc_des.h | 4 |
3 files changed, 54 insertions, 71 deletions
diff --git a/src/lib/libcrypto/des/Makefile b/src/lib/libcrypto/des/Makefile index 786e68802e..ae982265fd 100644 --- a/src/lib/libcrypto/des/Makefile +++ b/src/lib/libcrypto/des/Makefile | |||
@@ -12,8 +12,6 @@ MAKEFILE= Makefile | |||
12 | AR= ar r | 12 | AR= ar r |
13 | RANLIB= ranlib | 13 | RANLIB= ranlib |
14 | DES_ENC= des_enc.o fcrypt_b.o | 14 | DES_ENC= des_enc.o fcrypt_b.o |
15 | # or use | ||
16 | #DES_ENC= dx86-elf.o yx86-elf.o | ||
17 | 15 | ||
18 | CFLAGS= $(INCLUDES) $(CFLAG) | 16 | CFLAGS= $(INCLUDES) $(CFLAG) |
19 | ASFLAGS= $(INCLUDES) $(ASFLAG) | 17 | ASFLAGS= $(INCLUDES) $(ASFLAG) |
@@ -24,7 +22,7 @@ TEST=destest.c | |||
24 | APPS= | 22 | APPS= |
25 | 23 | ||
26 | LIB=$(TOP)/libcrypto.a | 24 | LIB=$(TOP)/libcrypto.a |
27 | LIBSRC= des_lib.c cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ | 25 | LIBSRC= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ |
28 | ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \ | 26 | ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \ |
29 | fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c \ | 27 | fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c \ |
30 | qud_cksm.c rand_key.c rpc_enc.c set_key.c \ | 28 | qud_cksm.c rand_key.c rpc_enc.c set_key.c \ |
@@ -33,7 +31,7 @@ LIBSRC= des_lib.c cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ | |||
33 | str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c des_old2.c \ | 31 | str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c des_old2.c \ |
34 | read2pwd.c | 32 | read2pwd.c |
35 | 33 | ||
36 | LIBOBJ= des_lib.o set_key.o ecb_enc.o cbc_enc.o \ | 34 | LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \ |
37 | ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o ofb64ede.o \ | 35 | ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o ofb64ede.o \ |
38 | enc_read.o enc_writ.o ofb64enc.o \ | 36 | enc_read.o enc_writ.o ofb64enc.o \ |
39 | ofb_enc.o str2key.o pcbc_enc.o qud_cksm.o rand_key.o \ | 37 | ofb_enc.o str2key.o pcbc_enc.o qud_cksm.o rand_key.o \ |
@@ -54,7 +52,7 @@ top: | |||
54 | all: lib | 52 | all: lib |
55 | 53 | ||
56 | lib: $(LIBOBJ) | 54 | lib: $(LIBOBJ) |
57 | $(ARX) $(LIB) $(LIBOBJ) | 55 | $(AR) $(LIB) $(LIBOBJ) |
58 | $(RANLIB) $(LIB) || echo Never mind. | 56 | $(RANLIB) $(LIB) || echo Never mind. |
59 | @touch lib | 57 | @touch lib |
60 | 58 | ||
@@ -64,21 +62,10 @@ des: des.o cbc3_enc.o lib | |||
64 | des_enc-sparc.S: asm/des_enc.m4 | 62 | des_enc-sparc.S: asm/des_enc.m4 |
65 | m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S | 63 | m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S |
66 | 64 | ||
67 | # ELF | 65 | des-586.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
68 | dx86-elf.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | 66 | $(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ |
69 | (cd asm; $(PERL) des-586.pl elf $(CFLAGS) > ../$@) | 67 | crypt586.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
70 | yx86-elf.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | 68 | $(PERL) asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ |
71 | (cd asm; $(PERL) crypt586.pl elf $(CFLAGS) > ../$@) | ||
72 | # COFF | ||
73 | dx86-cof.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | ||
74 | (cd asm; $(PERL) des-586.pl coff $(CFLAGS) > ../$@) | ||
75 | yx86-cof.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | ||
76 | (cd asm; $(PERL) crypt586.pl coff $(CFLAGS) > ../$@) | ||
77 | # a.out | ||
78 | dx86-out.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | ||
79 | (cd asm; $(PERL) des-586.pl a.out $(CFLAGS) > ../$@) | ||
80 | yx86-out.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | ||
81 | (cd asm; $(PERL) crypt586.pl a.out $(CFLAGS) > ../$@) | ||
82 | 69 | ||
83 | files: | 70 | files: |
84 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | 71 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |
@@ -156,14 +143,7 @@ des_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h | |||
156 | des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h | 143 | des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
157 | des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 144 | des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
158 | des_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 145 | des_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
159 | des_enc.o: des_enc.c des_locl.h ncbc_enc.c | 146 | des_enc.o: des_enc.c des_locl.h ncbc_enc.c spr.h |
160 | des_lib.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h | ||
161 | des_lib.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | ||
162 | des_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h | ||
163 | des_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
164 | des_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
165 | des_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | ||
166 | des_lib.o: ../../include/openssl/ui_compat.h des_lib.c des_locl.h des_ver.h | ||
167 | des_old.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | 147 | des_old.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
168 | des_old.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h | 148 | des_old.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
169 | des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h | 149 | des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h |
@@ -182,12 +162,13 @@ ecb3_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h | |||
182 | ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 162 | ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
183 | ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 163 | ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
184 | ecb3_enc.o: des_locl.h ecb3_enc.c | 164 | ecb3_enc.o: des_locl.h ecb3_enc.c |
165 | ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h | ||
185 | ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | 166 | ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
186 | ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h | 167 | ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
187 | ecb_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h | 168 | ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
188 | ecb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 169 | ecb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
189 | ecb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 170 | ecb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
190 | ecb_enc.o: des_locl.h ecb_enc.c spr.h | 171 | ecb_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h ecb_enc.c |
191 | ede_cbcm_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | 172 | ede_cbcm_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
192 | ede_cbcm_enc.o: ../../include/openssl/e_os2.h | 173 | ede_cbcm_enc.o: ../../include/openssl/e_os2.h |
193 | ede_cbcm_enc.o: ../../include/openssl/opensslconf.h | 174 | ede_cbcm_enc.o: ../../include/openssl/opensslconf.h |
@@ -277,11 +258,11 @@ rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | |||
277 | rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 258 | rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
278 | rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c | 259 | rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c |
279 | set_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | 260 | set_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h |
280 | set_key.o: ../../include/openssl/e_os2.h ../../include/openssl/fips.h | 261 | set_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h |
281 | set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/ossl_typ.h | 262 | set_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h |
282 | set_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 263 | set_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
283 | set_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 264 | set_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
284 | set_key.o: ../../include/openssl/ui_compat.h des_locl.h set_key.c | 265 | set_key.o: des_locl.h set_key.c |
285 | str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 266 | str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
286 | str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | 267 | str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h |
287 | str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 268 | str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h |
diff --git a/src/lib/libcrypto/des/des-lib.com b/src/lib/libcrypto/des/des-lib.com index fc2c35a1ce..348f1c0470 100644 --- a/src/lib/libcrypto/des/des-lib.com +++ b/src/lib/libcrypto/des/des-lib.com | |||
@@ -9,7 +9,7 @@ $! Changes by Richard Levitte <richard@levitte.org> | |||
9 | $! | 9 | $! |
10 | $! This command files compiles and creates the | 10 | $! This command files compiles and creates the |
11 | $! "[.xxx.EXE.CRYPTO.DES]LIBDES.OLB" library. The "xxx" denotes the machine | 11 | $! "[.xxx.EXE.CRYPTO.DES]LIBDES.OLB" library. The "xxx" denotes the machine |
12 | $! architecture of AXP or VAX. | 12 | $! architecture of ALPHA, IA64 or VAX. |
13 | $! | 13 | $! |
14 | $! It was re-written to try to determine which "C" compiler to try to use | 14 | $! It was re-written to try to determine which "C" compiler to try to use |
15 | $! or the user can specify a compiler in P3. | 15 | $! or the user can specify a compiler in P3. |
@@ -45,25 +45,34 @@ $! | |||
45 | $! | 45 | $! |
46 | $! Check Which Architecture We Are Using. | 46 | $! Check Which Architecture We Are Using. |
47 | $! | 47 | $! |
48 | $ IF (F$GETSYI("CPU").GE.128) | 48 | $ IF (F$GETSYI("CPU").LT.128) |
49 | $ THEN | 49 | $ THEN |
50 | $! | 50 | $! |
51 | $! The Architecture Is AXP. | 51 | $! The Architecture Is VAX |
52 | $! | 52 | $! |
53 | $ ARCH := AXP | 53 | $ ARCH := VAX |
54 | $! | 54 | $! |
55 | $! Else... | 55 | $! Else... |
56 | $! | 56 | $! |
57 | $ ELSE | 57 | $ ELSE |
58 | $! | 58 | $! |
59 | $! The Architecture Is VAX. | 59 | $! The Architecture Is Alpha, IA64 or whatever comes in the future. |
60 | $! | 60 | $! |
61 | $ ARCH := VAX | 61 | $ ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE") |
62 | $ IF (ARCH .EQS. "") THEN ARCH = "UNK" | ||
62 | $! | 63 | $! |
63 | $! End The Architecture Check. | 64 | $! End The Architecture Check. |
64 | $! | 65 | $! |
65 | $ ENDIF | 66 | $ ENDIF |
66 | $! | 67 | $! |
68 | $! Define The OBJ Directory Name. | ||
69 | $! | ||
70 | $ OBJ_DIR := SYS$DISK:[--.'ARCH'.OBJ.CRYPTO.DES] | ||
71 | $! | ||
72 | $! Define The EXE Directory Name. | ||
73 | $! | ||
74 | $ EXE_DIR :== SYS$DISK:[--.'ARCH'.EXE.CRYPTO.DES] | ||
75 | $! | ||
67 | $! Check To Make Sure We Have Valid Command Line Parameters. | 76 | $! Check To Make Sure We Have Valid Command Line Parameters. |
68 | $! | 77 | $! |
69 | $ GOSUB CHECK_OPTIONS | 78 | $ GOSUB CHECK_OPTIONS |
@@ -72,10 +81,6 @@ $! Tell The User What Kind of Machine We Run On. | |||
72 | $! | 81 | $! |
73 | $ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine." | 82 | $ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine." |
74 | $! | 83 | $! |
75 | $! Define The OBJ Directory Name. | ||
76 | $! | ||
77 | $ OBJ_DIR := SYS$DISK:[--.'ARCH'.OBJ.CRYPTO.DES] | ||
78 | $! | ||
79 | $! Check To See If The Architecture Specific OBJ Directory Exists. | 84 | $! Check To See If The Architecture Specific OBJ Directory Exists. |
80 | $! | 85 | $! |
81 | $ IF (F$PARSE(OBJ_DIR).EQS."") | 86 | $ IF (F$PARSE(OBJ_DIR).EQS."") |
@@ -89,10 +94,6 @@ $! End The Architecture Specific OBJ Directory Check. | |||
89 | $! | 94 | $! |
90 | $ ENDIF | 95 | $ ENDIF |
91 | $! | 96 | $! |
92 | $! Define The EXE Directory Name. | ||
93 | $! | ||
94 | $ EXE_DIR :== SYS$DISK:[--.'ARCH'.EXE.CRYPTO.DES] | ||
95 | $! | ||
96 | $! Check To See If The Architecture Specific Directory Exists. | 97 | $! Check To See If The Architecture Specific Directory Exists. |
97 | $! | 98 | $! |
98 | $ IF (F$PARSE(EXE_DIR).EQS."") | 99 | $ IF (F$PARSE(EXE_DIR).EQS."") |
@@ -564,7 +565,7 @@ $! | |||
564 | $ IF (F$SEARCH(OPT_FILE).EQS."") | 565 | $ IF (F$SEARCH(OPT_FILE).EQS."") |
565 | $ THEN | 566 | $ THEN |
566 | $! | 567 | $! |
567 | $! Figure Out If We Need An AXP Or A VAX Linker Option File. | 568 | $! Figure Out If We Need An non-VAX Or A VAX Linker Option File. |
568 | $! | 569 | $! |
569 | $ IF (F$GETSYI("CPU").LT.128) | 570 | $ IF (F$GETSYI("CPU").LT.128) |
570 | $ THEN | 571 | $ THEN |
@@ -584,19 +585,19 @@ $! Else... | |||
584 | $! | 585 | $! |
585 | $ ELSE | 586 | $ ELSE |
586 | $! | 587 | $! |
587 | $! Create The AXP Linker Option File. | 588 | $! Create The non-VAX Linker Option File. |
588 | $! | 589 | $! |
589 | $ CREATE 'OPT_FILE' | 590 | $ CREATE 'OPT_FILE' |
590 | $DECK | 591 | $DECK |
591 | ! | 592 | ! |
592 | ! Default System Options File For AXP To Link Agianst | 593 | ! Default System Options File For non-VAX To Link Agianst |
593 | ! The Sharable C Runtime Library. | 594 | ! The Sharable C Runtime Library. |
594 | ! | 595 | ! |
595 | SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE | 596 | SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE |
596 | SYS$SHARE:CMA$OPEN_RTL/SHARE | 597 | SYS$SHARE:CMA$OPEN_RTL/SHARE |
597 | $EOD | 598 | $EOD |
598 | $! | 599 | $! |
599 | $! End The VAX/AXP DEC C Option File Check. | 600 | $! End The DEC C Option File Check. |
600 | $! | 601 | $! |
601 | $ ENDIF | 602 | $ ENDIF |
602 | $! | 603 | $! |
@@ -658,13 +659,13 @@ $! Else... | |||
658 | $! | 659 | $! |
659 | $ ELSE | 660 | $ ELSE |
660 | $! | 661 | $! |
661 | $! Else, Check To See If P1 Has A Valid Arguement. | 662 | $! Else, Check To See If P1 Has A Valid Argument. |
662 | $! | 663 | $! |
663 | $ IF (P1.EQS."LIBRARY").OR.(P1.EQS."DESTEST").OR.(P1.EQS."SPEED") - | 664 | $ IF (P1.EQS."LIBRARY").OR.(P1.EQS."DESTEST").OR.(P1.EQS."SPEED") - |
664 | .OR.(P1.EQS."RPW").OR.(P1.EQS."DES").OR.(P1.EQS."DES_OPTS") | 665 | .OR.(P1.EQS."RPW").OR.(P1.EQS."DES").OR.(P1.EQS."DES_OPTS") |
665 | $ THEN | 666 | $ THEN |
666 | $! | 667 | $! |
667 | $! A Valid Arguement. | 668 | $! A Valid Argument. |
668 | $! | 669 | $! |
669 | $ BUILDALL = P1 | 670 | $ BUILDALL = P1 |
670 | $! | 671 | $! |
@@ -677,7 +678,7 @@ $! | |||
677 | $ WRITE SYS$OUTPUT "" | 678 | $ WRITE SYS$OUTPUT "" |
678 | $ WRITE SYS$OUTPUT "The Option ",P1," Is Invalid. The Valid Options Are:" | 679 | $ WRITE SYS$OUTPUT "The Option ",P1," Is Invalid. The Valid Options Are:" |
679 | $ WRITE SYS$OUTPUT "" | 680 | $ WRITE SYS$OUTPUT "" |
680 | $ WRITE SYS$OUTPUT " ALL : Just Build Everything. | 681 | $ WRITE SYS$OUTPUT " ALL : Just Build Everything." |
681 | $ WRITE SYS$OUTPUT " LIBRARY : To Compile Just The [.xxx.EXE.CRYPTO.DES]LIBDES.OLB Library." | 682 | $ WRITE SYS$OUTPUT " LIBRARY : To Compile Just The [.xxx.EXE.CRYPTO.DES]LIBDES.OLB Library." |
682 | $ WRITE SYS$OUTPUT " DESTEST : To Compile Just The [.xxx.EXE.CRYPTO.DES]DESTEST.EXE Program." | 683 | $ WRITE SYS$OUTPUT " DESTEST : To Compile Just The [.xxx.EXE.CRYPTO.DES]DESTEST.EXE Program." |
683 | $ WRITE SYS$OUTPUT " SPEED : To Compile Just The [.xxx.EXE.CRYPTO.DES]SPEED.EXE Program." | 684 | $ WRITE SYS$OUTPUT " SPEED : To Compile Just The [.xxx.EXE.CRYPTO.DES]SPEED.EXE Program." |
@@ -687,15 +688,16 @@ $ WRITE SYS$OUTPUT " DES_OPTS : To Compile Just The [.xxx.EXE.CRYTPO.DES | |||
687 | $ WRITE SYS$OUTPUT "" | 688 | $ WRITE SYS$OUTPUT "" |
688 | $ WRITE SYS$OUTPUT " Where 'xxx' Stands For: " | 689 | $ WRITE SYS$OUTPUT " Where 'xxx' Stands For: " |
689 | $ WRITE SYS$OUTPUT "" | 690 | $ WRITE SYS$OUTPUT "" |
690 | $ WRITE SYS$OUTPUT " AXP : Alpha Architecture." | 691 | $ WRITE SYS$OUTPUT " ALPHA : Alpha Architecture." |
691 | $ WRITE SYS$OUTPUT " VAX : VAX Architecture." | 692 | $ WRITE SYS$OUTPUT " IA64 : IA64 Architecture." |
693 | $ WRITE SYS$OUTPUT " VAX : VAX Architecture." | ||
692 | $ WRITE SYS$OUTPUT "" | 694 | $ WRITE SYS$OUTPUT "" |
693 | $! | 695 | $! |
694 | $! Time To EXIT. | 696 | $! Time To EXIT. |
695 | $! | 697 | $! |
696 | $ EXIT | 698 | $ EXIT |
697 | $! | 699 | $! |
698 | $! End The Valid Arguement Check. | 700 | $! End The Valid Argument Check. |
699 | $! | 701 | $! |
700 | $ ENDIF | 702 | $ ENDIF |
701 | $! | 703 | $! |
@@ -752,7 +754,7 @@ $! Time To EXIT. | |||
752 | $! | 754 | $! |
753 | $ EXIT | 755 | $ EXIT |
754 | $! | 756 | $! |
755 | $! End The Valid Arguement Check. | 757 | $! End The Valid Argument Check. |
756 | $! | 758 | $! |
757 | $ ENDIF | 759 | $ ENDIF |
758 | $! | 760 | $! |
@@ -817,7 +819,7 @@ $ ELSE | |||
817 | $! | 819 | $! |
818 | $! Check To See If We Have VAXC Or DECC. | 820 | $! Check To See If We Have VAXC Or DECC. |
819 | $! | 821 | $! |
820 | $ IF (ARCH.EQS."AXP").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."") | 822 | $ IF (ARCH.NES."VAX").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."") |
821 | $ THEN | 823 | $ THEN |
822 | $! | 824 | $! |
823 | $! Looks Like DECC, Set To Use DECC. | 825 | $! Looks Like DECC, Set To Use DECC. |
@@ -882,7 +884,7 @@ $ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + - | |||
882 | $! | 884 | $! |
883 | $! Define The Linker Options File Name. | 885 | $! Define The Linker Options File Name. |
884 | $! | 886 | $! |
885 | $ OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT" | 887 | $ OPT_FILE = "''EXE_DIR'VAX_DECC_OPTIONS.OPT" |
886 | $! | 888 | $! |
887 | $! End DECC Check. | 889 | $! End DECC Check. |
888 | $! | 890 | $! |
@@ -904,9 +906,9 @@ $! | |||
904 | $! Compile Using VAXC. | 906 | $! Compile Using VAXC. |
905 | $! | 907 | $! |
906 | $ CC = "CC" | 908 | $ CC = "CC" |
907 | $ IF ARCH.EQS."AXP" | 909 | $ IF ARCH.NES."VAX" |
908 | $ THEN | 910 | $ THEN |
909 | $ WRITE SYS$OUTPUT "There is no VAX C on Alpha!" | 911 | $ WRITE SYS$OUTPUT "There is no VAX C on ''ARCH'!" |
910 | $ EXIT | 912 | $ EXIT |
911 | $ ENDIF | 913 | $ ENDIF |
912 | $ IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC" | 914 | $ IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC" |
@@ -919,7 +921,7 @@ $ DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB] | |||
919 | $! | 921 | $! |
920 | $! Define The Linker Options File Name. | 922 | $! Define The Linker Options File Name. |
921 | $! | 923 | $! |
922 | $ OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT" | 924 | $ OPT_FILE = "''EXE_DIR'VAX_VAXC_OPTIONS.OPT" |
923 | $! | 925 | $! |
924 | $! End VAXC Check | 926 | $! End VAXC Check |
925 | $! | 927 | $! |
@@ -944,7 +946,7 @@ $ CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS | |||
944 | $! | 946 | $! |
945 | $! Define The Linker Options File Name. | 947 | $! Define The Linker Options File Name. |
946 | $! | 948 | $! |
947 | $ OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT" | 949 | $ OPT_FILE = "''EXE_DIR'VAX_GNUC_OPTIONS.OPT" |
948 | $! | 950 | $! |
949 | $! End The GNU C Check. | 951 | $! End The GNU C Check. |
950 | $! | 952 | $! |
@@ -976,7 +978,7 @@ $! Show user the result | |||
976 | $! | 978 | $! |
977 | $ WRITE SYS$OUTPUT "Main Compiling Command: ",CC | 979 | $ WRITE SYS$OUTPUT "Main Compiling Command: ",CC |
978 | $! | 980 | $! |
979 | $! Else The User Entered An Invalid Arguement. | 981 | $! Else The User Entered An Invalid Argument. |
980 | $! | 982 | $! |
981 | $ ELSE | 983 | $ ELSE |
982 | $! | 984 | $! |
diff --git a/src/lib/libcrypto/des/rpc_des.h b/src/lib/libcrypto/des/rpc_des.h index 4cbb4d2dcd..41328d7965 100644 --- a/src/lib/libcrypto/des/rpc_des.h +++ b/src/lib/libcrypto/des/rpc_des.h | |||
@@ -122,10 +122,10 @@ struct desparams { | |||
122 | /* | 122 | /* |
123 | * Encrypt an arbitrary sized buffer | 123 | * Encrypt an arbitrary sized buffer |
124 | */ | 124 | */ |
125 | #define DESIOCBLOCK _IOWR(d, 6, struct desparams) | 125 | #define DESIOCBLOCK _IOWR('d', 6, struct desparams) |
126 | 126 | ||
127 | /* | 127 | /* |
128 | * Encrypt of small amount of data, quickly | 128 | * Encrypt of small amount of data, quickly |
129 | */ | 129 | */ |
130 | #define DESIOCQUICK _IOWR(d, 7, struct desparams) | 130 | #define DESIOCQUICK _IOWR('d', 7, struct desparams) |
131 | 131 | ||