Changeset 12238
- Timestamp:
- 06/01/09 15:42:16 (4 years ago)
- Location:
- src/router/openssl
- Files:
-
- 36 edited
-
Configure (modified) (9 diffs)
-
INSTALL (modified) (1 diff)
-
Makefile (modified) (11 diffs)
-
Makefile.org (modified) (6 diffs)
-
Makefile.shared (modified) (3 diffs)
-
apps/Makefile (modified) (1 diff)
-
apps/apps.h (modified) (1 diff)
-
apps/progs.h (modified) (1 diff)
-
apps/speed.c (modified) (26 diffs)
-
config (modified) (5 diffs)
-
crypto/cryptlib.h (modified) (1 diff)
-
crypto/engine/eng_all.c (modified) (2 diffs)
-
crypto/engine/eng_cryptodev.c (modified) (23 diffs)
-
crypto/engine/engine.h (modified) (1 diff)
-
crypto/evp/c_all.c (modified) (1 diff)
-
crypto/evp/c_alld.c (modified) (1 diff)
-
crypto/opensslconf.h (modified) (15 diffs)
-
engines/Makefile (modified) (1 diff)
-
ssl/d1_clnt.c (modified) (2 diffs)
-
ssl/d1_lib.c (modified) (1 diff)
-
ssl/d1_pkt.c (modified) (3 diffs)
-
ssl/s3_clnt.c (modified) (1 diff)
-
ssl/ssl.h (modified) (1 diff)
-
ssl/ssl_lib.c (modified) (1 diff)
-
ssl/ssl_sess.c (modified) (1 diff)
-
ssl/t1_enc.c (modified) (2 diffs)
-
tools/c_rehash (modified) (1 diff)
-
tools/c_rehash.in (modified) (1 diff)
-
util/clean-depend.pl (modified) (1 diff)
-
util/domd (modified) (3 diffs)
-
util/libeay.num (modified) (8 diffs)
-
util/mkdef.pl (modified) (1 diff)
-
util/mkerr.pl (modified) (1 diff)
-
util/mkstack.pl (modified) (1 diff)
-
util/pod2man.pl (modified) (1 diff)
-
util/selftest.pl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
src/router/openssl/Configure
r12237 r12238 1 : 1 #!/usr/bin/perl 2 2 eval 'exec perl -S $0 ${1+"$@"}' 3 3 if $running_under_some_shell; … … 37 37 # --with-krb5-flavor Declare what flavor of Kerberos 5 is used. Currently 38 38 # supported values are "MIT" and "Heimdal". A value is required. 39 # --with-cryptodev Force support for cryptodev (ie., ocf-linux) 40 # --with-cryptodev-digests Force support for cryptodev digests (generally slow) 39 41 # 40 42 # --test-sanity Make a number of sanity checks on the data in this file. … … 365 367 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}", 366 368 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}", 369 # OpenWrt targets 370 "linux-openwrt","gcc:-DTERMIO \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 367 371 368 372 #### *BSD [do see comment about ${BSDthreads} above!] … … 545 549 ##### Compaq Non-Stop Kernel (Tandem) 546 550 "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", 551 552 # uClinux 553 "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG::::::::::::\$(LIBSSL_dlfcn):linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}", 547 554 548 555 ); … … 600 607 my $no_dso=0; 601 608 my $no_gmp=0; 609 my $have_cryptodev=0; 610 my $use_cryptodev_digests=0; 602 611 my @skip=(); 603 612 my $Makefile="Makefile"; … … 747 756 { 748 757 exit(&test_sanity()); 758 } 759 elsif (/^--with-cryptodev$/) 760 { 761 $have_cryptodev = 1; 762 } 763 elsif (/^--with-cryptodev-digests$/) 764 { 765 $use_cryptodev_digests = 1; 749 766 } 750 767 elsif (/^reconfigure/ || /^reconf/) … … 1036 1053 1037 1054 if (/^err$/) { $flags .= "-DOPENSSL_NO_ERR "; } 1055 elsif (/^hw$/) { $flags .= "-DOPENSSL_NO_HW "; } 1038 1056 elsif (/^asm$/) { $no_asm = 1; } 1039 1057 } … … 1158 1176 if $withargs{"krb5-include"} eq "" && 1159 1177 $withargs{"krb5-dir"} ne ""; 1178 } 1179 1180 # enable the linux cryptodev (ocf-linux) support 1181 if ($have_cryptodev) 1182 { 1183 if ($use_cryptodev_digests) 1184 { 1185 $cflags = "-DUSE_CRYPTODEV_DIGESTS $cflags"; 1186 } 1187 $cflags = "-DHAVE_CRYPTODEV $cflags"; 1160 1188 } 1161 1189 … … 1849 1877 } 1850 1878 1879 # ugly hack to disable engines 1880 if($target eq "mingwx") { 1881 system("sed -e s/^LIB/XLIB/g -i engines/Makefile"); 1882 } 1883 1851 1884 print <<EOF; 1852 1885 -
src/router/openssl/INSTALL
r12237 r12238 104 104 library directories or other compiler options. 105 105 106 --with-cryptodev Enabled the BSD cryptodev engine even if we are not using 107 BSD. Useful if you are running ocf-linux or something 108 similar. Once enabled you can also enable the use of 109 cryptodev digests, with is usually slower unless you have 110 large amounts data. Use --with-cryptodev-digests to force 111 it. 106 112 107 113 Installation in Detail -
src/router/openssl/Makefile
r12237 r12238 12 12 SHLIB_MAJOR=0 13 13 SHLIB_MINOR=9.8 14 SHLIB_EXT= 15 PLATFORM= dist16 OPTIONS= no-camellia no-capieng no-cms no-gmp no-jpake no-krb5 no-mdc2 no-montasm no-rc5 no-rfc3779 no-seed no-shared no-zlib no-zlib-dynamic17 CONFIGURE_ARGS= dist18 SHLIB_TARGET= 14 SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR) 15 PLATFORM=linux-openwrt 16 OPTIONS=--prefix=/usr --openssldir=/etc/ssl -Os -pipe -mips32 -mtune=mips32 -funit-at-a-time -DHAVE_AR531X -ldl -DOPENSSL_SMALL_FOOTPRINT enable-zlib-dynamic no-aes192 no-ans1 no-camellia no-capieng no-cms no-ec no-ecdh no-ecdsa no-engines no-err no-gmp no-hw no-idea no-jpake no-krb5 no-md2 no-mdc2 no-montasm no-perlasm no-rc5 no-rfc3779 no-ripemd no-rmd160 no-seed no-sha0 no-shared no-smime no-sse2 no-threads 17 CONFIGURE_ARGS=linux-openwrt --prefix=/usr --openssldir=/etc/ssl -Os -pipe -mips32 -mtune=mips32 -funit-at-a-time -DHAVE_AR531X -ldl -DOPENSSL_SMALL_FOOTPRINT no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-smime no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5 no-ec no-err no-hw no-threads zlib-dynamic no-engines no-sse2 no-perlasm 18 SHLIB_TARGET=linux-shared 19 19 20 20 # HERE indicates where this Makefile lives. This can be used to indicate … … 27 27 # Normally it is left empty. 28 28 INSTALL_PREFIX= 29 INSTALLTOP=/usr /local/ssl29 INSTALLTOP=/usr 30 30 31 31 # Do not edit this manually. Use Configure --openssldir=DIR do change this! 32 OPENSSLDIR=/ usr/local/ssl32 OPENSSLDIR=/etc/ssl 33 33 34 34 # NO_IDEA - Define to build without the IDEA algorithm … … 60 60 # PKCS1_CHECK - pkcs1 tests. 61 61 62 CC= cc63 CFLAG= - O64 DEPFLAG= -DOPENSSL_NO_ CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED62 CC= mips-linux-uclibc-gcc 63 CFLAG= -DZLIB_SHARED -DZLIB -DDSO_DLFCN -DHAVE_DLFCN_H -Os -pipe -mips32 -mtune=mips32 -funit-at-a-time -DHAVE_AR531X -DOPENSSL_SMALL_FOOTPRINT -DOPENSSL_NO_ERR -DOPENSSL_NO_HW -DTERMIO $(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall 64 DEPFLAG= -DOPENSSL_NO_AES192 -DOPENSSL_NO_ANS1 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_EC -DOPENSSL_NO_ECDH -DOPENSSL_NO_ECDSA -DOPENSSL_NO_ENGINES -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_PERLASM -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_RIPEMD -DOPENSSL_NO_RMD160 -DOPENSSL_NO_SEED -DOPENSSL_NO_SHA0 -DOPENSSL_NO_SMIME 65 65 PEX_LIBS= 66 EX_LIBS= 66 EX_LIBS= -ldl -ldl 67 67 EXE_EXT= 68 68 ARFLAGS= … … 134 134 BASEADDR=0xFB00000 135 135 136 DIRS= crypto ssl engines apps test tools136 DIRS= crypto ssl apps 137 137 SHLIBDIRS= crypto ssl 138 138 … … 140 140 SDIRS= \ 141 141 objects \ 142 md 2 md4 md5 sha hmac ripemd\143 des aes rc2 rc4 ideabf cast \144 bn ec rsa dsa ecdsa dh ecdh dso engine \142 md4 md5 sha hmac \ 143 des aes rc2 rc4 bf cast \ 144 bn rsa dsa dh dso engine \ 145 145 buffer bio stack lhash rand err \ 146 146 evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \ … … 170 170 SHARED_FIPS= 171 171 SHARED_LIBS= 172 SHARED_LIBS_LINK_EXTS= 172 SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so 173 173 SHARED_LDFLAGS= 174 174 … … 336 336 build_fips: 337 337 @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD) 338 build_ssl: 338 build_ssl: build_crypto 339 339 @dir=ssl; target=all; $(BUILD_ONE_CMD) 340 build_engines: 340 build_engines: build_crypto 341 341 @dir=engines; target=all; $(BUILD_ONE_CMD) 342 build_apps: 342 build_apps: build_libs 343 343 @dir=apps; target=all; $(BUILD_ONE_CMD) 344 build_tests: 344 build_tests: build_libs 345 345 @dir=test; target=all; $(BUILD_ONE_CMD) 346 build_tools: 346 build_tools: build_libs 347 347 @dir=tools; target=all; $(BUILD_ONE_CMD) 348 348 … … 360 360 else \ 361 361 if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ 362 FIPSLD_CC= $(CC); CC=fips/fipsld; \362 FIPSLD_CC="$(CC)"; CC=fips/fipsld; \ 363 363 export CC FIPSLD_CC; \ 364 364 fi; \ … … 383 383 libfips$(SHLIB_EXT): fips/fipscanister.o 384 384 @if [ "$(SHLIB_TARGET)" != "" ]; then \ 385 FIPSLD_CC= $(CC); CC=fips/fipsld; export CC FIPSLD_CC; \385 FIPSLD_CC="$(CC)"; CC=fips/fipsld; export CC FIPSLD_CC; \ 386 386 $(MAKE) -f Makefile.shared -e $(BUILDENV) \ 387 387 CC=$${CC} LIBNAME=fips THIS=$@ \ … … 505 505 links: 506 506 @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl 507 @$(PERL) $(TOP)/util/mklink.pl include/openssl $( EXHEADER)507 @$(PERL) $(TOP)/util/mklink.pl include/openssl $(HEADER) $(EXHEADER) 508 508 @set -e; target=links; $(RECURSIVE_BUILD_CMD) 509 509 @if [ -z "$(FIPSCANLIB)" ]; then \ … … 614 614 (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) 615 615 616 install: all install_ docs install_sw616 install: all install_sw 617 617 618 618 install_sw: -
src/router/openssl/Makefile.org
r12237 r12238 132 132 BASEADDR= 133 133 134 DIRS= crypto fips ssl engines apps test tools134 DIRS= crypto fips ssl apps 135 135 SHLIBDIRS= crypto ssl fips 136 136 … … 334 334 build_fips: 335 335 @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD) 336 build_ssl: 336 build_ssl: build_crypto 337 337 @dir=ssl; target=all; $(BUILD_ONE_CMD) 338 build_engines: 338 build_engines: build_crypto 339 339 @dir=engines; target=all; $(BUILD_ONE_CMD) 340 build_apps: 340 build_apps: build_libs 341 341 @dir=apps; target=all; $(BUILD_ONE_CMD) 342 build_tests: 342 build_tests: build_libs 343 343 @dir=test; target=all; $(BUILD_ONE_CMD) 344 build_tools: 344 build_tools: build_libs 345 345 @dir=tools; target=all; $(BUILD_ONE_CMD) 346 346 … … 358 358 else \ 359 359 if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ 360 FIPSLD_CC= $(CC); CC=fips/fipsld; \360 FIPSLD_CC="$(CC)"; CC=fips/fipsld; \ 361 361 export CC FIPSLD_CC; \ 362 362 fi; \ … … 381 381 libfips$(SHLIB_EXT): fips/fipscanister.o 382 382 @if [ "$(SHLIB_TARGET)" != "" ]; then \ 383 FIPSLD_CC= $(CC); CC=fips/fipsld; export CC FIPSLD_CC; \383 FIPSLD_CC="$(CC)"; CC=fips/fipsld; export CC FIPSLD_CC; \ 384 384 $(MAKE) -f Makefile.shared -e $(BUILDENV) \ 385 385 CC=$${CC} LIBNAME=fips THIS=$@ \ … … 503 503 links: 504 504 @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl 505 @$(PERL) $(TOP)/util/mklink.pl include/openssl $( EXHEADER)505 @$(PERL) $(TOP)/util/mklink.pl include/openssl $(HEADER) $(EXHEADER) 506 506 @set -e; target=links; $(RECURSIVE_BUILD_CMD) 507 507 @if [ -z "$(FIPSCANLIB)" ]; then \ … … 612 612 (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) 613 613 614 install: all install_ docs install_sw614 install: all install_sw 615 615 616 616 install_sw: -
src/router/openssl/Makefile.shared
r12237 r12238 7 7 8 8 # CC contains the current compiler. This one MUST be defined 9 CC =cc10 CFLAGS =$(CFLAG)9 CC?=cc 10 CFLAGS?=$(CFLAG) 11 11 # LDFLAGS contains flags to be used when temporary object files (when building 12 12 # shared libraries) are created, or when an application is linked. 13 13 # SHARED_LDFLAGS contains flags to be used when the shared library is created. 14 LDFLAGS =15 SHARED_LDFLAGS =14 LDFLAGS?= 15 SHARED_LDFLAGS?= 16 16 17 17 # LIBNAME contains just the name of the library, without prefix ("lib" … … 94 94 LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \ 95 95 LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ 96 LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \97 96 $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} ) 98 97 … … 104 103 LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \ 105 104 LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ 106 LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \107 105 $${SHAREDCMD} $${SHAREDFLAGS} \ 108 106 -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ -
src/router/openssl/apps/Makefile
r12237 r12238 154 154 shlib_target="$(SHLIB_TARGET)"; \ 155 155 elif [ -n "$(FIPSCANLIB)" ]; then \ 156 FIPSLD_CC= $(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \156 FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ 157 157 fi; \ 158 158 LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ 159 159 [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ 160 160 $(MAKE) -f $(TOP)/Makefile.shared -e \ 161 CC= $${CC}APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \161 CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ 162 162 LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ 163 163 link_app.$${shlib_target} -
src/router/openssl/apps/apps.h
r12237 r12238 113 113 #define HEADER_APPS_H 114 114 115 #include "e_os.h"115 #include <openssl/e_os.h> 116 116 117 117 #include <openssl/bio.h> -
src/router/openssl/apps/progs.h
r12237 r12238 130 130 {FUNC_TYPE_GENERAL,"engine",engine_main}, 131 131 #endif 132 #ifndef OPENSSL_NO_OCSP 132 133 {FUNC_TYPE_GENERAL,"ocsp",ocsp_main}, 134 #endif 133 135 {FUNC_TYPE_GENERAL,"prime",prime_main}, 134 136 #ifndef OPENSSL_NO_MD2 -
src/router/openssl/apps/speed.c
r12237 r12238 293 293 "aes-128 ige","aes-192 ige","aes-256 ige"}; 294 294 static double results[ALGOR_NUM][SIZE_NUM]; 295 static int lengths[SIZE_NUM]={16,64,256,1024, 8*1024};295 static int lengths[SIZE_NUM]={16,64,256,1024,2*1024,4*1024}; 296 296 static double rsa_results[RSA_NUM][2]; 297 297 static double dsa_results[DSA_NUM][2]; … … 328 328 #define START 0 329 329 #define STOP 1 330 331 #ifdef __linux__ 332 /* 333 * record CPU usage as well 334 */ 335 336 static int do_cpu = 0; 337 338 struct cpu_stat { 339 unsigned int user; 340 unsigned int nice; 341 unsigned int system; 342 unsigned int idle; 343 unsigned int total; 344 }; 345 346 static unsigned int cpu_usage[ALGOR_NUM][SIZE_NUM]; 347 static unsigned int rsa_cpu_usage[RSA_NUM][2]; 348 static unsigned int dsa_cpu_usage[DSA_NUM][2]; 349 static struct cpu_stat cpu_start, cpu_finish; 350 351 static void 352 get_cpu(int s) 353 { 354 FILE *fp = NULL; 355 unsigned char buf[80]; 356 struct cpu_stat *st = s == START ? &cpu_start : &cpu_finish; 357 358 memset(st, 0, sizeof(*st)); 359 360 if (fp == NULL) 361 fp = fopen("/proc/stat", "r"); 362 if (!fp) 363 return; 364 if (fseek(fp, 0, SEEK_SET) == -1) { 365 fclose(fp); 366 return; 367 } 368 fscanf(fp, "%s %d %d %d %d", &buf[0], &st->user, &st->nice, 369 &st->system, &st->idle); 370 st->total = st->user + st->nice + st->system + st->idle; 371 fclose(fp); 372 } 373 374 static unsigned int 375 calc_cpu() 376 { 377 unsigned int total, res; 378 379 total = cpu_finish.total - cpu_start.total; 380 if (total <= 0) 381 return 0; 382 #if 1 // busy 383 res = ((cpu_finish.system + cpu_finish.user + cpu_finish.nice) - 384 (cpu_start.system + cpu_start.user + cpu_start.nice)) * 385 100 / total; 386 #endif 387 #if 0 // system 388 res = (cpu_finish.system - cpu_start.system) * 100 / total; 389 #endif 390 #if 0 // user 391 res = (cpu_finish.user - cpu_start.user) * 100 / total; 392 #endif 393 #if 0 // nice 394 res = (cpu_finish.nice - cpu_start.nice) * 100 / total; 395 #endif 396 #if 0 // idle 397 res = (cpu_finish.idle - cpu_start.idle) * 100 / total; 398 #endif 399 return(res); 400 } 401 402 #endif 330 403 331 404 #if defined(OPENSSL_SYS_NETWARE) … … 358 431 { 359 432 double ret; 433 434 #ifdef __linux__ 435 if (do_cpu) 436 get_cpu(s); 437 #endif 360 438 361 439 #ifdef USE_TOD … … 833 911 an algorithm. */ 834 912 } 913 #ifdef __linux__ 914 else if ((argc > 0) && (strcmp(*argv,"-cpu") == 0)) 915 { 916 do_cpu = 1; 917 j--; /* Otherwise, -cpu gets confused with 918 an algorithm. */ 919 } 920 #endif 835 921 else if ((argc > 0) && (strcmp(*argv,"-evp") == 0)) 836 922 { … … 1261 1347 BIO_printf(bio_err,"-multi n run n benchmarks in parallel.\n"); 1262 1348 #endif 1349 #ifdef __linux__ 1350 BIO_printf(bio_err,"-cpu calculate cpu utilisation.\n"); 1351 #endif 1263 1352 goto end; 1264 1353 } … … 1267 1356 j++; 1268 1357 } 1269 1270 #ifdef HAVE_FORK1271 if(multi && do_multi(multi))1272 goto show_res;1273 #endif1274 1358 1275 1359 if (j == 0) … … 1605 1689 #endif /* SIGALRM */ 1606 1690 1691 #ifdef HAVE_FORK /* DM */ 1692 if(multi && do_multi(multi)) 1693 goto show_res; 1694 #endif 1695 1607 1696 #ifndef OPENSSL_NO_MD2 1608 1697 if (doit[D_MD2]) … … 2034 2123 * optimization here! names[D_EVP] 2035 2124 * somehow becomes NULL */ 2036 print_message(names[D_EVP],save_count,2037 lengths[j]);2038 2125 2039 2126 EVP_CIPHER_CTX_init(&ctx); … … 2043 2130 EVP_EncryptInit_ex(&ctx,evp_cipher,NULL,key16,iv); 2044 2131 EVP_CIPHER_CTX_set_padding(&ctx, 0); 2132 2133 print_message(names[D_EVP],save_count, 2134 lengths[j]); 2045 2135 2046 2136 Time_F(START); … … 2108 2198 } 2109 2199 d=Time_F(STOP); 2200 if (do_cpu) 2201 rsa_cpu_usage[j][0] = calc_cpu(); 2110 2202 BIO_printf(bio_err,mr ? "+R1:%ld:%d:%.2f\n" 2111 2203 : "%ld %d bit private RSA's in %.2fs\n", … … 2143 2235 } 2144 2236 d=Time_F(STOP); 2237 if (do_cpu) 2238 rsa_cpu_usage[j][1] = calc_cpu(); 2145 2239 BIO_printf(bio_err,mr ? "+R2:%ld:%d:%.2f\n" 2146 2240 : "%ld %d bit public RSA's in %.2fs\n", … … 2202 2296 } 2203 2297 d=Time_F(STOP); 2298 if (do_cpu) 2299 dsa_cpu_usage[j][0] = calc_cpu(); 2204 2300 BIO_printf(bio_err,mr ? "+R3:%ld:%d:%.2f\n" 2205 2301 : "%ld %d bit DSA signs in %.2fs\n", … … 2237 2333 } 2238 2334 d=Time_F(STOP); 2335 if (do_cpu) 2336 dsa_cpu_usage[j][1] = calc_cpu(); 2239 2337 BIO_printf(bio_err,mr ? "+R4:%ld:%d:%.2f\n" 2240 2338 : "%ld %d bit DSA verify in %.2fs\n", … … 2531 2629 fprintf(stdout,"type "); 2532 2630 } 2533 for (j=0; j<SIZE_NUM; j++) 2631 for (j=0; j<SIZE_NUM; j++) { 2534 2632 fprintf(stdout,mr ? ":%d" : "%7d bytes",lengths[j]); 2633 if (do_cpu && !mr) 2634 fprintf(stdout, " /cpu"); 2635 } 2535 2636 fprintf(stdout,"\n"); 2536 2637 } … … 2539 2640 { 2540 2641 if (!doit[k]) continue; 2642 if (k == D_EVP) { 2643 if (evp_cipher) 2644 names[D_EVP]=OBJ_nid2ln(evp_cipher->nid); 2645 else 2646 names[D_EVP]=OBJ_nid2ln(evp_md->type); 2647 } 2541 2648 if(mr) 2542 2649 fprintf(stdout,"+F:%d:%s",k,names[k]); … … 2549 2656 else 2550 2657 fprintf(stdout,mr ? ":%.2f" : " %11.2f ",results[k][j]); 2658 if (do_cpu) 2659 fprintf(stdout, mr ? "/%d" : "/%%%-3d", cpu_usage[k][j]); 2551 2660 } 2552 2661 fprintf(stdout,"\n"); … … 2563 2672 } 2564 2673 if(mr) 2565 fprintf(stdout,"+F2:%u:%u:%f:%f\n", 2566 k,rsa_bits[k],rsa_results[k][0], 2567 rsa_results[k][1]); 2568 else 2569 fprintf(stdout,"rsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n", 2570 rsa_bits[k],rsa_results[k][0],rsa_results[k][1], 2571 1.0/rsa_results[k][0],1.0/rsa_results[k][1]); 2674 fprintf(stdout,"+F2:%u:%u:%f", k,rsa_bits[k],rsa_results[k][0]); 2675 else 2676 fprintf(stdout,"rsa %4u bits %8.6fs",rsa_bits[k],rsa_results[k][0]); 2677 if (do_cpu) 2678 fprintf(stdout, mr ? "/%d": "/%%%-3d", rsa_cpu_usage[k][0]); 2679 fprintf(stdout, mr ? ":%f" : " %8.6fs", rsa_results[k][1]); 2680 if (do_cpu) 2681 fprintf(stdout, mr ? "/%d": "/%%%-3d", rsa_cpu_usage[k][1]); 2682 if(!mr) 2683 fprintf(stdout, " %8.1f %8.1f", 2684 1.0/rsa_results[k][0],1.0/rsa_results[k][1]); 2685 fprintf(stdout, "\n"); 2572 2686 } 2573 2687 #endif … … 2583 2697 } 2584 2698 if(mr) 2585 fprintf(stdout,"+F3:%u:%u:%f:%f\n", 2586 k,dsa_bits[k],dsa_results[k][0],dsa_results[k][1]); 2587 else 2588 fprintf(stdout,"dsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n", 2589 dsa_bits[k],dsa_results[k][0],dsa_results[k][1], 2590 1.0/dsa_results[k][0],1.0/dsa_results[k][1]); 2699 fprintf(stdout,"+F3:%u:%u:%f", k,dsa_bits[k],dsa_results[k][0]); 2700 else 2701 fprintf(stdout,"dsa %4u bits %8.6fs",dsa_bits[k],dsa_results[k][0]); 2702 if (do_cpu) 2703 fprintf(stdout, mr ? "/%d": "/%%%-3d", dsa_cpu_usage[k][0]); 2704 fprintf(stdout, mr ? ":%f" : " %8.6fs", dsa_results[k][1]); 2705 if (do_cpu) 2706 fprintf(stdout, mr ? "/%d": "/%%%-3d", dsa_cpu_usage[k][1]); 2707 if(!mr) 2708 fprintf(stdout, " %8.1f %8.1f", 2709 1.0/dsa_results[k][0],1.0/dsa_results[k][1]); 2710 fprintf(stdout, "\n"); 2591 2711 } 2592 2712 #endif … … 2713 2833 static void print_result(int alg,int run_no,int count,double time_used) 2714 2834 { 2715 BIO_printf(bio_err,mr ? "+R:%d:%s:%f\n" 2716 : "%d %s's in %.2fs\n",count,names[alg],time_used); 2835 if (do_cpu) 2836 cpu_usage[alg][run_no] = calc_cpu(); 2837 BIO_printf(bio_err,mr ? "+R:%ld:%s:%f\n" 2838 : "%ld %s's in %.2fs\n",count,names[alg],time_used); 2717 2839 results[alg][run_no]=((double)count)/time_used*lengths[run_no]; 2718 2840 } … … 2809 2931 alg=atoi(sstrsep(&p,sep)); 2810 2932 sstrsep(&p,sep); 2811 for(j=0 ; j < SIZE_NUM ; ++j) 2933 for(j=0 ; j < SIZE_NUM ; ++j) { 2934 if (do_cpu && strchr(p, '/')) 2935 cpu_usage[alg][j] = atoi(strchr(p, '/') + 1); 2812 2936 results[alg][j]+=atof(sstrsep(&p,sep)); 2937 } 2813 2938 } 2814 2939 else if(!strncmp(buf,"+F2:",4)) … … 2821 2946 sstrsep(&p,sep); 2822 2947 2948 /* before we move the token along */ 2949 if (do_cpu && strchr(p, '/')) 2950 rsa_cpu_usage[k][0] = atoi(strchr(p, '/') + 1); 2823 2951 d=atof(sstrsep(&p,sep)); 2824 2952 if(n) … … 2827 2955 rsa_results[k][0]=d; 2828 2956 2957 /* before we move the token along */ 2958 if (do_cpu && strchr(p, '/')) 2959 rsa_cpu_usage[k][1] = atoi(strchr(p, '/') + 1); 2829 2960 d=atof(sstrsep(&p,sep)); 2830 2961 if(n) … … 2833 2964 rsa_results[k][1]=d; 2834 2965 } 2835 else if(!strncmp(buf,"+F 2:",4))2966 else if(!strncmp(buf,"+F3:",4)) 2836 2967 { 2837 2968 int k; … … 2842 2973 sstrsep(&p,sep); 2843 2974 2975 /* before we move the token along */ 2976 if (do_cpu && strchr(p, '/')) 2977 dsa_cpu_usage[k][0] = atoi(strchr(p, '/') + 1); 2844 2978 d=atof(sstrsep(&p,sep)); 2845 2979 if(n) 2846 rsa_results[k][0]=1/(1/rsa_results[k][0]+1/d);2980 dsa_results[k][0]=1/(1/dsa_results[k][0]+1/d); 2847 2981 else 2848 rsa_results[k][0]=d; 2849 2982 dsa_results[k][0]=d; 2983 2984 /* before we move the token along */ 2985 if (do_cpu && strchr(p, '/')) 2986 dsa_cpu_usage[k][1] = atoi(strchr(p, '/') + 1); 2850 2987 d=atof(sstrsep(&p,sep)); 2851 2988 if(n) 2852 rsa_results[k][1]=1/(1/rsa_results[k][1]+1/d);2989 dsa_results[k][1]=1/(1/dsa_results[k][1]+1/d); 2853 2990 else 2854 rsa_results[k][1]=d; 2855 } 2856 else if(!strncmp(buf,"+F3:",4)) 2991 dsa_results[k][1]=d; 2992 } 2993 #ifndef OPENSSL_NO_ECDSA 2994 else if(!strncmp(buf,"+F4:",4)) 2857 2995 { 2858 2996 int k; … … 2865 3003 d=atof(sstrsep(&p,sep)); 2866 3004 if(n) 2867 dsa_results[k][0]=1/(1/dsa_results[k][0]+1/d);3005 ecdsa_results[k][0]=1/(1/ecdsa_results[k][0]+1/d); 2868 3006 else 2869 dsa_results[k][0]=d;3007 ecdsa_results[k][0]=d; 2870 3008 2871 3009 d=atof(sstrsep(&p,sep)); 2872 3010 if(n) 2873 dsa_results[k][1]=1/(1/dsa_results[k][1]+1/d);3011 ecdsa_results[k][1]=1/(1/ecdsa_results[k][1]+1/d); 2874 3012 else 2875 dsa_results[k][1]=d; 2876 } 2877 #ifndef OPENSSL_NO_ECDSA 2878 else if(!strncmp(buf,"+F4:",4)) 3013 ecdsa_results[k][1]=d; 3014 } 3015 #endif 3016 3017 #ifndef OPENSSL_NO_ECDH 3018 else if(!strncmp(buf,"+F5:",4)) 2879 3019 { 2880 3020 int k; … … 2887 3027 d=atof(sstrsep(&p,sep)); 2888 3028 if(n) 2889 ecdsa_results[k][0]=1/(1/ecdsa_results[k][0]+1/d);2890 else2891 ecdsa_results[k][0]=d;2892 2893 d=atof(sstrsep(&p,sep));2894 if(n)2895 ecdsa_results[k][1]=1/(1/ecdsa_results[k][1]+1/d);2896 else2897 ecdsa_results[k][1]=d;2898 }2899 #endif2900 2901 #ifndef OPENSSL_NO_ECDH2902 else if(!strncmp(buf,"+F5:",4))2903 {2904 int k;2905 double d;2906 2907 p=buf+4;2908 k=atoi(sstrsep(&p,sep));2909 sstrsep(&p,sep);2910 2911 d=atof(sstrsep(&p,sep));2912 if(n)2913 3029 ecdh_results[k][0]=1/(1/ecdh_results[k][0]+1/d); 2914 3030 else -
src/router/openssl/config
r12237 r12238 49 49 # First get uname entries that we use below 50 50 51 MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"52 RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"53 SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown"54 VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"51 [ "$MACHINE" ] || MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown" 52 [ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown" 53 [ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown" 54 [ "$VERSION" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" 55 55 56 56 … … 271 271 ;; 272 272 *) 273 echo " i386-apple-darwin${VERSION}"273 echo "${MACHINE}-apple-darwin${VERSION}" 274 274 ;; 275 275 esac … … 400 400 # --------------------------------------------------------------------------- 401 401 402 GCCVER=`(gcc -dumpversion) 2>/dev/null` 402 # figure out if gcc is available and if so we use it otherwise 403 # we fallback to whatever cc does on the system 404 CC="${CC:-gcc}" 405 GCCVER=`(${CC} -dumpversion) 2>/dev/null` 403 406 if [ "$GCCVER" != "" ]; then 404 407 # then strip off whatever prefix egcs prepends the number with... … … 410 413 # peak single digit before and after first dot, e.g. 2.95.1 gives 29 411 414 GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` 415 else 416 CC="${CC:-cc}" 412 417 fi 413 418 … … 489 494 # more time that I want to waste at the moment 490 495 case "$GUESSOS" in 496 uClinux*) 497 OUT=uClinux-dist 498 ;; 491 499 mips2-sgi-irix) 492 500 CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` -
src/router/openssl/crypto/cryptlib.h
r12237 r12238 63 63 #include <string.h> 64 64 65 #include "e_os.h"65 #include <openssl/e_os.h> 66 66 67 67 #ifdef OPENSSL_USE_APPLINK -
src/router/openssl/crypto/engine/eng_all.c
r12237 r12238 105 105 #endif 106 106 #ifndef OPENSSL_NO_HW 107 #if defined(__OpenBSD__) || defined(__FreeBSD__) 107 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) 108 108 ENGINE_load_cryptodev(); 109 109 #endif … … 114 114 } 115 115 116 #if defined(__OpenBSD__) || defined(__FreeBSD__) 116 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) 117 117 void ENGINE_setup_bsd_cryptodev(void) { 118 118 static int bsd_cryptodev_default_loaded = 0; -
src/router/openssl/crypto/engine/eng_cryptodev.c
r12237 r12238 69 69 struct session_op d_sess; 70 70 int d_fd; 71 72 #ifdef USE_CRYPTODEV_DIGESTS 73 char dummy_mac_key[20]; 74 75 unsigned char digest_res[20]; 76 char *mac_data; 77 int mac_len; 78 79 int copy; 80 #endif 71 81 }; 72 82 … … 76 86 static int open_dev_crypto(void); 77 87 static int get_dev_crypto(void); 88 #if 0 78 89 static int cryptodev_max_iv(int cipher); 79 90 static int cryptodev_key_length_valid(int cipher, int len); 80 91 static int cipher_nid_to_cryptodev(int nid); 92 #endif 81 93 static int get_cryptodev_ciphers(const int **cnids); 82 94 static int get_cryptodev_digests(const int **cnids); … … 101 113 const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); 102 114 static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, 103 RSA *rsa );115 RSA *rsa, BN_CTX *ctx); 104 116 static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx); 105 117 static int cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, … … 131 143 int keylen; 132 144 } ciphers[] = { 145 { CRYPTO_ARC4, NID_rc4, 0, 16, }, 133 146 { CRYPTO_DES_CBC, NID_des_cbc, 8, 8, }, 134 147 { CRYPTO_3DES_CBC, NID_des_ede3_cbc, 8, 24, }, 135 148 { CRYPTO_AES_CBC, NID_aes_128_cbc, 16, 16, }, 149 { CRYPTO_AES_CBC, NID_aes_192_cbc, 16, 24, }, 150 { CRYPTO_AES_CBC, NID_aes_256_cbc, 16, 32, }, 136 151 { CRYPTO_BLF_CBC, NID_bf_cbc, 8, 16, }, 137 152 { CRYPTO_CAST_CBC, NID_cast5_cbc, 8, 16, }, … … 143 158 int id; 144 159 int nid; 160 int keylen; 145 161 } digests[] = { 146 { CRYPTO_SHA1_HMAC, NID_hmacWithSHA1, },147 { CRYPTO_RIPEMD160_HMAC, NID_ripemd160, },148 { CRYPTO_MD5_KPDK, NID_undef, },149 { CRYPTO_SHA1_KPDK, NID_undef, },150 { CRYPTO_MD5, NID_md5, },151 { CRYPTO_SHA1, NID_ undef,},152 { 0, NID_undef, },162 { CRYPTO_SHA1_HMAC, NID_hmacWithSHA1, 20}, 163 { CRYPTO_RIPEMD160_HMAC, NID_ripemd160, 16/*?*/}, 164 { CRYPTO_MD5_KPDK, NID_undef, 0}, 165 { CRYPTO_SHA1_KPDK, NID_undef, 0}, 166 { CRYPTO_MD5, NID_md5, 16}, 167 { CRYPTO_SHA1, NID_sha1, 20}, 168 { 0, NID_undef, 0}, 153 169 }; 154 170 … … 177 193 get_dev_crypto(void) 178 194 { 179 int fd, retfd; 180 181 if ((fd = open_dev_crypto()) == -1) 182 return (-1); 195 static int fd = -1; 196 int retfd; 197 198 if (fd == -1) { 199 if ((fd = open_dev_crypto()) == -1) 200 return (-1); 201 if (fcntl(fd, F_SETFD, 1) == -1) { 202 close(fd); 203 return (-1); 204 } 205 } 183 206 if (ioctl(fd, CRIOGET, &retfd) == -1) 184 207 return (-1); … … 203 226 } 204 227 228 #if 0 205 229 /* 206 230 * XXXX this needs to be set for each alg - and determined from … … 246 270 return (0); 247 271 } 272 #endif 248 273 249 274 /* … … 265 290 } 266 291 memset(&sess, 0, sizeof(sess)); 267 sess.key = (caddr_t)"12345678 1234567812345678";292 sess.key = (caddr_t)"123456789abcdefghijklmno"; 268 293 269 294 for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) { … … 304 329 } 305 330 memset(&sess, 0, sizeof(sess)); 331 sess.mackey = (caddr_t)"123456789abcdefghijklmno"; 306 332 for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) { 307 333 if (digests[i].nid == NID_undef) 308 334 continue; 309 335 sess.mac = digests[i].id; 336 sess.mackeylen = digests[i].keylen; 310 337 sess.cipher = 0; 311 338 if (ioctl(fd, CIOCGSESSION, &sess) != -1 && … … 352 379 cryptodev_usable_digests(const int **nids) 353 380 { 381 #ifdef USE_CRYPTODEV_DIGESTS 382 return (get_cryptodev_digests(nids)); 383 #else 354 384 /* 355 385 * XXXX just disable all digests for now, because it sucks. … … 366 396 *nids = NULL; 367 397 return (0); 398 #endif 368 399 } 369 400 … … 428 459 struct dev_crypto_state *state = ctx->cipher_data; 429 460 struct session_op *sess = &state->d_sess; 430 int cipher; 431 432 if ((cipher = cipher_nid_to_cryptodev(ctx->cipher->nid)) == NID_undef) 433 return (0); 434 435 if (ctx->cipher->iv_len > cryptodev_max_iv(cipher)) 436 return (0); 437 438 if (!cryptodev_key_length_valid(cipher, ctx->key_len)) 439 return (0); 461 int cipher, i; 462 463 for (i = 0; ciphers[i].id; i++) 464 if (ctx->cipher->nid == ciphers[i].nid && 465 ctx->cipher->iv_len <= ciphers[i].ivmax && 466 ctx->key_len == ciphers[i].keylen) { 467 cipher = ciphers[i].id; 468 break; 469 } 470 471 if (!ciphers[i].id) { 472 state->d_fd = -1; 473 return (0); 474 } 440 475 441 476 memset(sess, 0, sizeof(struct session_op)); … … 496 531 * gets called when libcrypto requests a cipher NID. 497 532 */ 533 534 /* RC4 */ 535 const EVP_CIPHER cryptodev_rc4 = { 536 NID_rc4, 537 1, 16, 0, 538 EVP_CIPH_VARIABLE_LENGTH, 539 cryptodev_init_key, 540 cryptodev_cipher, 541 cryptodev_cleanup, 542 sizeof(struct dev_crypto_state), 543 NULL, 544 NULL, 545 NULL 546 }; 498 547 499 548 /* DES CBC EVP */ … … 564 613 }; 565 614 615 const EVP_CIPHER cryptodev_aes_192_cbc = { 616 NID_aes_192_cbc, 617 16, 24, 16, 618 EVP_CIPH_CBC_MODE, 619 cryptodev_init_key, 620 cryptodev_cipher, 621 cryptodev_cleanup, 622 sizeof(struct dev_crypto_state), 623 EVP_CIPHER_set_asn1_iv, 624 EVP_CIPHER_get_asn1_iv, 625 NULL 626 }; 627 628 const EVP_CIPHER cryptodev_aes_256_cbc = { 629 NID_aes_256_cbc, 630 16, 32, 16, 631 EVP_CIPH_CBC_MODE, 632 cryptodev_init_key, 633 cryptodev_cipher, 634 cryptodev_cleanup, 635 sizeof(struct dev_crypto_state), 636 EVP_CIPHER_set_asn1_iv, 637 EVP_CIPHER_get_asn1_iv, 638 NULL 639 }; 640 566 641 /* 567 642 * Registered by the ENGINE when used to find out how to deal with … … 577 652 578 653 switch (nid) { 654 case NID_rc4: 655 *cipher = &cryptodev_rc4; 656 break; 579 657 case NID_des_ede3_cbc: 580 658 *cipher = &cryptodev_3des_cbc; … … 592 670 *cipher = &cryptodev_aes_cbc; 593 671 break; 672 case NID_aes_192_cbc: 673 *cipher = &cryptodev_aes_192_cbc; 674 break; 675 case NID_aes_256_cbc: 676 *cipher = &cryptodev_aes_256_cbc; 677 break; 594 678 default: 595 679 *cipher = NULL; … … 599 683 } 600 684 685 686 #ifdef USE_CRYPTODEV_DIGESTS 687 688 /* convert digest type to cryptodev */ 689 static int 690 digest_nid_to_cryptodev(int nid) 691 { 692 int i; 693 694 for (i = 0; digests[i].id; i++) 695 if (digests[i].nid == nid) 696 return (digests[i].id); 697 return (0); 698 } 699 700 701 static int 702 digest_key_length(int nid) 703 { 704 int i; 705 706 for (i = 0; digests[i].id; i++) 707 if (digests[i].nid == nid) 708 return digests[i].keylen; 709 return (0); 710 } 711 712 713 static int cryptodev_digest_init(EVP_MD_CTX *ctx) 714 { 715 struct dev_crypto_state *state = ctx->md_data; 716 struct session_op *sess = &state->d_sess; 717 int digest; 718 719 if ((digest = digest_nid_to_cryptodev(ctx->digest->type)) == NID_undef){ 720 printf("cryptodev_digest_init: Can't get digest \n"); 721 return (0); 722 } 723 724 memset(state, 0, sizeof(struct dev_crypto_state)); 725 726 if ((state->d_fd = get_dev_crypto()) < 0) { 727 printf("cryptodev_digest_init: Can't get Dev \n"); 728 return (0); 729 } 730 731 sess->mackey = state->dummy_mac_key; 732 sess->mackeylen = digest_key_length(ctx->digest->type); 733 sess->mac = digest; 734 735 if (ioctl(state->d_fd, CIOCGSESSION, sess) < 0) { 736 close(state->d_fd); 737 state->d_fd = -1; 738 printf("cryptodev_digest_init: Open session failed\n"); 739 return (0); 740 } 741 742 return (1); 743 } 744 745 static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, 746 size_t count) 747 { 748 struct crypt_op cryp; 749 struct dev_crypto_state *state = ctx->md_data; 750 struct session_op *sess = &state->d_sess; 751 752 if (!data || state->d_fd < 0) { 753 printf("cryptodev_digest_update: illegal inputs \n"); 754 return (0); 755 } 756 757 if (!count) { 758 return (0); 759 } 760 761 if (!(ctx->flags & EVP_MD_CTX_FLAG_ONESHOT)) { 762 /* if application doesn't support one buffer */ 763 state->mac_data = OPENSSL_realloc(state->mac_data, state->mac_len + count); 764 765 if (!state->mac_data) { 766 printf("cryptodev_digest_update: realloc failed\n"); 767 return (0); 768 } 769 770 memcpy(state->mac_data + state->mac_len, data, count); 771 state->mac_len += count; 772 773 return (1); 774 } 775 776 memset(&cryp, 0, sizeof(cryp)); 777 778 cryp.ses = sess->ses; 779 cryp.flags = 0; 780 cryp.len = count; 781 cryp.src = (caddr_t) data; 782 cryp.dst = NULL; 783 cryp.mac = state->digest_res; 784 if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) { 785 printf("cryptodev_digest_update: digest failed\n"); 786 return (0); 787 } 788 return (1); 789 } 790 791 792 static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) 793 { 794 struct crypt_op cryp; 795 struct dev_crypto_state *state = ctx->md_data; 796 struct session_op *sess = &state->d_sess; 797 798 int ret = 1; 799 800 if (!md || state->d_fd < 0) { 801 printf("cryptodev_digest_final: illegal input\n"); 802 return(0); 803 } 804 805 if (! (ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) ) { 806 /* if application doesn't support one buffer */ 807 memset(&cryp, 0, sizeof(cryp)); 808 809 cryp.ses = sess->ses; 810 cryp.flags = 0; 811 cryp.len = state->mac_len; 812 cryp.src = state->mac_data; 813 cryp.dst = NULL; 814 cryp.mac = md; 815 816 if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) { 817 printf("cryptodev_digest_final: digest failed\n"); 818 return (0); 819 } 820 821 return 1; 822 } 823 824 memcpy(md, state->digest_res, ctx->digest->md_size); 825 826 return (ret); 827 } 828 829 830 static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx) 831 { 832 int ret = 1; 833 struct dev_crypto_state *state = ctx->md_data; 834 struct session_op *sess = &state->d_sess; 835 836 if (state->d_fd < 0) { 837 printf("cryptodev_digest_cleanup: illegal input\n"); 838 return (0); 839 } 840 841 if (state->mac_data) { 842 OPENSSL_free(state->mac_data); 843 state->mac_data = NULL; 844 state->mac_len = 0; 845 } 846 847 if (state->copy) 848 return 1; 849 850 if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) { 851 printf("cryptodev_digest_cleanup: failed to close session\n"); 852 ret = 0; 853 } else { 854 ret = 1; 855 } 856 close(state->d_fd); 857 state->d_fd = -1; 858 859 return (ret); 860 } 861 862 static int cryptodev_digest_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from) 863 { 864 struct dev_crypto_state *fstate = from->md_data; 865 struct dev_crypto_state *dstate = to->md_data; 866 867 memcpy(dstate, fstate, sizeof(struct dev_crypto_state)); 868 869 if (fstate->mac_len != 0) { 870 dstate->mac_data = OPENSSL_malloc(fstate->mac_len); 871 memcpy(dstate->mac_data, fstate->mac_data, fstate->mac_len); 872 } 873 874 dstate->copy = 1; 875 876 return 1; 877 } 878 879 880 const EVP_MD cryptodev_sha1 = { 881 NID_sha1, 882 NID_undef, 883 SHA_DIGEST_LENGTH, 884 EVP_MD_FLAG_ONESHOT, 885 cryptodev_digest_init, 886 cryptodev_digest_update, 887 cryptodev_digest_final, 888 cryptodev_digest_copy, 889 cryptodev_digest_cleanup, 890 EVP_PKEY_NULL_method, 891 SHA_CBLOCK, 892 sizeof(struct dev_crypto_state), 893 }; 894 895 const EVP_MD cryptodev_md5 = { 896 NID_md5, 897 NID_undef, 898 16 /* MD5_DIGEST_LENGTH */, 899 EVP_MD_FLAG_ONESHOT, 900 cryptodev_digest_init, 901 cryptodev_digest_update, 902 cryptodev_digest_final, 903 cryptodev_digest_copy, 904 cryptodev_digest_cleanup, 905 EVP_PKEY_NULL_method, 906 64 /* MD5_CBLOCK */, 907 sizeof(struct dev_crypto_state), 908 }; 909 910 #endif /* USE_CRYPTODEV_DIGESTS */ 911 912 601 913 static int 602 914 cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest, … … 607 919 608 920 switch (nid) { 921 #ifdef USE_CRYPTODEV_DIGESTS 609 922 case NID_md5: 610 *digest = NULL; /* need to make a clean md5 critter */923 *digest = &cryptodev_md5; 611 924 break; 925 case NID_sha1: 926 *digest = &cryptodev_sha1; 927 break; 612 928 default: 929 #endif /* USE_CRYPTODEV_DIGESTS */ 613 930 *digest = NULL; 614 931 break; … … 626 943 { 627 944 int i, j, k; 628 ssize_t words,bytes, bits;945 ssize_t bytes, bits; 629 946 u_char *b; 630 947 … … 638 955 if (b == NULL) 639 956 return (1); 957 memset(b, 0, bytes); 640 958 641 959 crp->crp_p = b; … … 682 1000 int i; 683 1001 684 for (i = 0; i < =kop->crk_iparams + kop->crk_oparams; i++) {1002 for (i = 0; i < kop->crk_iparams + kop->crk_oparams; i++) { 685 1003 if (kop->crk_param[i].crp_p) 686 1004 free(kop->crk_param[i].crp_p); … … 757 1075 758 1076 static int 759 cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa )1077 cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) 760 1078 { 761 1079 int r; 762 BN_CTX *ctx; 763 764 ctx = BN_CTX_new(); 1080 ctx = BN_CTX_new(); /* not sure why we reallocate this. DM */ 765 1081 r = cryptodev_bn_mod_exp(r0, I, rsa->d, rsa->n, ctx, NULL); 766 1082 BN_CTX_free(ctx); -
src/router/openssl/crypto/engine/engine.h
r12237 r12238 704 704 void *ENGINE_get_static_state(void); 705 705 706 #if defined(__OpenBSD__) || defined(__FreeBSD__) 706 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) 707 707 void ENGINE_setup_bsd_cryptodev(void); 708 708 #endif -
src/router/openssl/crypto/evp/c_all.c
r12237 r12238 84 84 OpenSSL_add_all_digests(); 85 85 #ifndef OPENSSL_NO_ENGINE 86 # if defined(__OpenBSD__) || defined(__FreeBSD__) 86 # if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) 87 87 ENGINE_setup_bsd_cryptodev(); 88 88 # endif -
src/router/openssl/crypto/evp/c_alld.c
r12237 r12238 82 82 #endif 83 83 #endif 84 #if ndef OPENSSL_NO_SHA84 #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1) 85 85 EVP_add_digest(EVP_sha1()); 86 86 EVP_add_digest_alias(SN_sha1,"ssl3-sha1"); -
src/router/openssl/crypto/opensslconf.h
r12237 r12238 6 6 7 7 8 #ifndef OPENSSL_NO_AES192 9 # define OPENSSL_NO_AES192 10 #endif 11 #ifndef OPENSSL_NO_ANS1 12 # define OPENSSL_NO_ANS1 13 #endif 8 14 #ifndef OPENSSL_NO_CAMELLIA 9 15 # define OPENSSL_NO_CAMELLIA … … 15 21 # define OPENSSL_NO_CMS 16 22 #endif 23 #ifndef OPENSSL_NO_EC 24 # define OPENSSL_NO_EC 25 #endif 26 #ifndef OPENSSL_NO_ECDH 27 # define OPENSSL_NO_ECDH 28 #endif 29 #ifndef OPENSSL_NO_ECDSA 30 # define OPENSSL_NO_ECDSA 31 #endif 32 #ifndef OPENSSL_NO_ENGINES 33 # define OPENSSL_NO_ENGINES 34 #endif 17 35 #ifndef OPENSSL_NO_GMP 18 36 # define OPENSSL_NO_GMP 19 37 #endif 38 #ifndef OPENSSL_NO_IDEA 39 # define OPENSSL_NO_IDEA 40 #endif 20 41 #ifndef OPENSSL_NO_JPAKE 21 42 # define OPENSSL_NO_JPAKE … … 24 45 # define OPENSSL_NO_KRB5 25 46 #endif 47 #ifndef OPENSSL_NO_MD2 48 # define OPENSSL_NO_MD2 49 #endif 26 50 #ifndef OPENSSL_NO_MDC2 27 51 # define OPENSSL_NO_MDC2 28 52 #endif 53 #ifndef OPENSSL_NO_PERLASM 54 # define OPENSSL_NO_PERLASM 55 #endif 29 56 #ifndef OPENSSL_NO_RC5 30 57 # define OPENSSL_NO_RC5 … … 33 60 # define OPENSSL_NO_RFC3779 34 61 #endif 62 #ifndef OPENSSL_NO_RIPEMD 63 # define OPENSSL_NO_RIPEMD 64 #endif 65 #ifndef OPENSSL_NO_RMD160 66 # define OPENSSL_NO_RMD160 67 #endif 35 68 #ifndef OPENSSL_NO_SEED 36 69 # define OPENSSL_NO_SEED 37 70 #endif 71 #ifndef OPENSSL_NO_SHA0 72 # define OPENSSL_NO_SHA0 73 #endif 74 #ifndef OPENSSL_NO_SMIME 75 # define OPENSSL_NO_SMIME 76 #endif 38 77 39 78 #endif /* OPENSSL_DOING_MAKEDEPEND */ 40 79 80 #ifndef OPENSSL_NO_ERR 81 # define OPENSSL_NO_ERR 82 #endif 83 #ifndef OPENSSL_NO_HW 84 # define OPENSSL_NO_HW 85 #endif 41 86 #ifndef OPENSSL_NO_DYNAMIC_ENGINE 42 87 # define OPENSSL_NO_DYNAMIC_ENGINE … … 48 93 applications. */ 49 94 #ifdef OPENSSL_ALGORITHM_DEFINES 95 # if defined(OPENSSL_NO_AES192) && !defined(NO_AES192) 96 # define NO_AES192 97 # endif 98 # if defined(OPENSSL_NO_ANS1) && !defined(NO_ANS1) 99 # define NO_ANS1 100 # endif 50 101 # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) 51 102 # define NO_CAMELLIA … … 57 108 # define NO_CMS 58 109 # endif 110 # if defined(OPENSSL_NO_EC) && !defined(NO_EC) 111 # define NO_EC 112 # endif 113 # if defined(OPENSSL_NO_ECDH) && !defined(NO_ECDH) 114 # define NO_ECDH 115 # endif 116 # if defined(OPENSSL_NO_ECDSA) && !defined(NO_ECDSA) 117 # define NO_ECDSA 118 # endif 119 # if defined(OPENSSL_NO_ENGINES) && !defined(NO_ENGINES) 120 # define NO_ENGINES 121 # endif 59 122 # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 60 123 # define NO_GMP 61 124 # endif 125 # if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA) 126 # define NO_IDEA 127 # endif 62 128 # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) 63 129 # define NO_JPAKE … … 66 132 # define NO_KRB5 67 133 # endif 134 # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) 135 # define NO_MD2 136 # endif 68 137 # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 69 138 # define NO_MDC2 70 139 # endif 140 # if defined(OPENSSL_NO_PERLASM) && !defined(NO_PERLASM) 141 # define NO_PERLASM 142 # endif 71 143 # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) 72 144 # define NO_RC5 … … 75 147 # define NO_RFC3779 76 148 # endif 149 # if defined(OPENSSL_NO_RIPEMD) && !defined(NO_RIPEMD) 150 # define NO_RIPEMD 151 # endif 152 # if defined(OPENSSL_NO_RMD160) && !defined(NO_RMD160) 153 # define NO_RMD160 154 # endif 77 155 # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 78 156 # define NO_SEED 157 # endif 158 # if defined(OPENSSL_NO_SHA0) && !defined(NO_SHA0) 159 # define NO_SHA0 160 # endif 161 # if defined(OPENSSL_NO_SMIME) && !defined(NO_SMIME) 162 # define NO_SMIME 79 163 # endif 80 164 #endif … … 102 186 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 103 187 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 104 #define ENGINESDIR "/usr/l ocal/ssl/lib/engines"105 #define OPENSSLDIR "/ usr/local/ssl"188 #define ENGINESDIR "/usr/lib/engines" 189 #define OPENSSLDIR "/etc/ssl" 106 190 #endif 107 191 #endif … … 134 218 * - elder Alpha because it lacks byte load/store instructions; 135 219 */ 136 #define RC4_INT unsigned int220 #define RC4_INT unsigned char 137 221 #endif 138 222 #if !defined(RC4_CHUNK) … … 141 225 * boundary. See crypto/rc4/rc4_enc.c for further details. 142 226 */ 143 # undef RC4_CHUNK227 #define RC4_CHUNK unsigned long 144 228 #endif 145 229 #endif … … 149 233 * %20 speed up (longs are 8 bytes, int's are 4). */ 150 234 #ifndef DES_LONG 151 #define DES_LONG unsigned long235 #define DES_LONG unsigned int 152 236 #endif 153 237 #endif … … 155 239 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) 156 240 #define CONFIG_HEADER_BN_H 157 # undefBN_LLONG241 #define BN_LLONG 158 242 159 243 /* Should we define BN_DIV2W here? */ … … 179 263 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) 180 264 #define CONFIG_HEADER_BF_LOCL_H 181 # undefBF_PTR265 #define BF_PTR 182 266 #endif /* HEADER_BF_LOCL_H */ 183 267 … … 209 293 * Very mucy CPU dependant */ 210 294 #ifndef DES_UNROLL 211 # undefDES_UNROLL295 #define DES_UNROLL 212 296 #endif 213 297 -
src/router/openssl/engines/Makefile
r12237 r12238 97 97 if [ "$(PLATFORM)" != "Cygwin" ]; then \ 98 98 case "$(CFLAGS)" in \ 99 *OPENSSL_NO_HW*) continue;; \ 99 100 *DSO_DLFCN*) sfx="so";; \ 100 101 *DSO_DL*) sfx="sl";; \ -
src/router/openssl/ssl/d1_clnt.c
r12237 r12238 131 131 static SSL_METHOD *dtls1_get_client_method(int ver) 132 132 { 133 if (ver == DTLS1_VERSION )133 if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER) 134 134 return(DTLSv1_client_method()); 135 135 else … … 182 182 if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1); 183 183 184 if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00)) 184 if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00) && 185 (s->version & 0xff00 ) != (DTLS1_BAD_VER & 0xff00)) 185 186 { 186 187 SSLerr(SSL_F_DTLS1_CONNECT, ERR_R_INTERNAL_ERROR); -
src/router/openssl/ssl/d1_lib.c
r12237 r12238 188 188 { 189 189 ssl3_clear(s); 190 s->version=DTLS1_VERSION; 190 if (s->options & SSL_OP_CISCO_ANYCONNECT) 191 s->version=DTLS1_BAD_VER; 192 else 193 s->version=DTLS1_VERSION; 191 194 } 192 195 -
src/router/openssl/ssl/d1_pkt.c
r12237 r12238 988 988 { 989 989 struct ccs_header_st ccs_hdr; 990 int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH; 990 991 991 992 dtls1_get_ccs_header(rr->data, &ccs_hdr); … … 994 995 * exactly what the record payload has to look like */ 995 996 /* XDTLS: check that epoch is consistent */ 996 if ( (s->client_version == DTLS1_BAD_VER && rr->length != 3) || 997 (s->client_version != DTLS1_BAD_VER && rr->length != DTLS1_CCS_HEADER_LENGTH) || 998 (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS)) 997 if (s->client_version == DTLS1_BAD_VER || s->version == DTLS1_BAD_VER) 998 ccs_hdr_len = 3; 999 1000 if ((rr->length != ccs_hdr_len) || (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS)) 999 1001 { 1000 1002 i=SSL_AD_ILLEGAL_PARAMETER; … … 1312 1314 /* 'create_empty_fragment' is true only when this function calls itself */ 1313 1315 if (!clear && !create_empty_fragment && !s->s3->empty_fragment_done 1314 && SSL_version(s) != DTLS1_VERSION)1316 && SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER) 1315 1317 { 1316 1318 /* countermeasure against known-IV weakness in CBC ciphersuites -
src/router/openssl/ssl/s3_clnt.c
r12237 r12238 709 709 if (!ok) return((int)n); 710 710 711 if ( SSL_version(s) == DTLS1_VERSION )711 if ( SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER) 712 712 { 713 713 if ( s->s3->tmp.message_type == DTLS1_MT_HELLO_VERIFY_REQUEST) -
src/router/openssl/ssl/ssl.h
r12237 r12238 511 511 /* Don't use RFC4507 ticket extension */ 512 512 #define SSL_OP_NO_TICKET 0x00004000L 513 /* Use Cisco's "speshul" version of DTLS_BAD_VER (as client) */ 514 #define SSL_OP_CISCO_ANYCONNECT 0x00008000L 513 515 514 516 /* As server, disallow session resumption on renegotiation */ -
src/router/openssl/ssl/ssl_lib.c
r12237 r12238 996 996 return(l); 997 997 case SSL_CTRL_SET_MTU: 998 if (SSL_version(s) == DTLS1_VERSION) 998 if (SSL_version(s) == DTLS1_VERSION || 999 SSL_version(s) == DTLS1_BAD_VER) 999 1000 { 1000 1001 s->d1->mtu = larg; -
src/router/openssl/ssl/ssl_sess.c
r12237 r12238 212 212 ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH; 213 213 } 214 else if (s->version == DTLS1_BAD_VER) 215 { 216 ss->ssl_version=DTLS1_BAD_VER; 217 ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH; 218 } 214 219 else if (s->version == DTLS1_VERSION) 215 220 { -
src/router/openssl/ssl/t1_enc.c
r12237 r12238 766 766 HMAC_Init_ex(&hmac,mac_sec,EVP_MD_size(hash),hash,NULL); 767 767 768 if (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER) 768 if (ssl->version == DTLS1_BAD_VER || 769 (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER)) 769 770 { 770 771 unsigned char dtlsseq[8],*p=dtlsseq; 771 772 772 s2n(send?ssl->d1->w_epoch:ssl->d1->r_epoch, p); 773 773 memcpy (p,&seq[2],6); … … 794 794 #endif 795 795 796 if ( SSL_version(ssl) != DTLS1_VERSION )796 if ( SSL_version(ssl) != DTLS1_VERSION && SSL_version(ssl) != DTLS1_BAD_VER) 797 797 { 798 798 for (i=7; i>=0; i--) -
src/router/openssl/tools/c_rehash
r12237 r12238 7 7 my $openssl; 8 8 9 my $dir = "/ usr/local/ssl";9 my $dir = "/etc/ssl"; 10 10 11 11 if(defined $ENV{OPENSSL}) { -
src/router/openssl/tools/c_rehash.in
r12237 r12238 1 #!/usr/ local/bin/perl1 #!/usr/bin/perl 2 2 3 3 -
src/router/openssl/util/clean-depend.pl
r12237 r12238 1 #!/usr/ local/bin/perl -w1 #!/usr/bin/perl -w 2 2 # Clean the dependency list in a makefile of standard includes... 3 3 # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999 -
src/router/openssl/util/domd
r12237 r12238 1 #!/ bin/sh1 #!/usr/bin/env bash 2 2 # Do a makedepend, only leave out the standard headers 3 3 # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999 … … 15 15 # fake the presence of Kerberos 16 16 touch $TOP/krb5.h 17 if [ "$MAKEDEPEND" = "gcc" ]; then 17 D=${MAKEDEPEND/%*gcc/gcc} 18 if [ "$D" = "gcc" ]; then 18 19 args="" 19 20 while [ $# -gt 0 ]; do … … 23 24 sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp 24 25 echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp 25 ${ CC:-gcc} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp26 ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp && \ 26 27 ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new 28 RC=$? 27 29 rm -f Makefile.tmp 28 30 else 29 ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@ 31 ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@ && \ 30 32 ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new 33 RC=$? 31 34 fi 32 35 mv Makefile.new Makefile 33 36 # unfake the presence of Kerberos 34 37 rm $TOP/krb5.h 38 39 exit $RC -
src/router/openssl/util/libeay.num
r12237 r12238 2072 2072 KRB5_CHECKSUM_free 2634 EXIST::FUNCTION: 2073 2073 OCSP_REQUEST_get_ext 2635 EXIST::FUNCTION: 2074 ENGINE_load_ubsec 2636 EXIST::FUNCTION:ENGINE,STATIC_ENGINE2075 2074 ENGINE_register_all_digests 2637 EXIST::FUNCTION:ENGINE 2076 2075 PKEY_USAGE_PERIOD_it 2638 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: … … 2546 2545 OCSP_resp_count 3025 EXIST::FUNCTION: 2547 2546 KRB5_CHECKSUM_new 3026 EXIST::FUNCTION: 2548 ENGINE_load_cswift 3027 EXIST::FUNCTION:ENGINE,STATIC_ENGINE2549 2547 OCSP_onereq_get0_id 3028 EXIST::FUNCTION: 2550 2548 ENGINE_set_default_ciphers 3029 EXIST::FUNCTION:ENGINE … … 2577 2575 i2d_OCSP_SIGNATURE 3053 EXIST::FUNCTION: 2578 2576 asn1_enc_save 3054 EXIST::FUNCTION: 2579 ENGINE_load_nuron 3055 EXIST::FUNCTION:ENGINE,STATIC_ENGINE2580 2577 _ossl_old_des_pcbc_encrypt 3056 EXIST::FUNCTION:DES 2581 2578 PKCS12_MAC_DATA_it 3057 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: … … 2601 2598 ENGINE_set_table_flags 3073 EXIST::FUNCTION:ENGINE 2602 2599 AES_options 3074 EXIST::FUNCTION:AES 2603 ENGINE_load_chil 3075 EXIST::FUNCTION:ENGINE,STATIC_ENGINE2604 2600 OCSP_id_cmp 3076 EXIST::FUNCTION: 2605 2601 OCSP_BASICRESP_new 3077 EXIST::FUNCTION: … … 2668 2664 i2d_KRB5_AUTHENTBODY 3128 EXIST::FUNCTION: 2669 2665 OCSP_REQUEST_get_ext_count 3129 EXIST::FUNCTION: 2670 ENGINE_load_atalla 3130 EXIST::FUNCTION:ENGINE,STATIC_ENGINE2671 2666 X509_NAME_it 3131 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: 2672 2667 X509_NAME_it 3131 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: … … 2763 2758 UI_UTIL_read_pw 3208 EXIST::FUNCTION: 2764 2759 UI_UTIL_read_pw_string 3209 EXIST::FUNCTION: 2765 ENGINE_load_aep 3210 EXIST::FUNCTION:ENGINE,STATIC_ENGINE2766 ENGINE_load_sureware 3211 EXIST::FUNCTION:ENGINE,STATIC_ENGINE2767 2760 OPENSSL_add_all_algorithms_noconf 3212 EXIST:!VMS:FUNCTION: 2768 2761 OPENSSL_add_all_algo_noconf 3212 EXIST:VMS:FUNCTION: … … 2773 2766 AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES 2774 2767 AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES 2775 ENGINE_load_4758cca 3218 EXIST::FUNCTION:ENGINE,STATIC_ENGINE2776 2768 _ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES 2777 2769 EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES … … 3108 3100 STORE_meth_set_modify_fn 3530 EXIST:VMS:FUNCTION: 3109 3101 STORE_parse_attrs_next 3531 EXIST::FUNCTION: 3110 ENGINE_load_padlock 3532 EXIST::FUNCTION:ENGINE3111 3102 EC_GROUP_set_curve_name 3533 EXIST::FUNCTION:EC 3112 3103 X509_CERT_PAIR_it 3534 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: -
src/router/openssl/util/mkdef.pl
r12237 r12238 1 #!/usr/ local/bin/perl -w1 #!/usr/bin/perl 2 2 # 3 3 # generate a .def file -
src/router/openssl/util/mkerr.pl
r12237 r12238 1 #!/usr/ local/bin/perl -w1 #!/usr/bin/perl 2 2 3 3 my $config = "crypto/err/openssl.ec"; -
src/router/openssl/util/mkstack.pl
r12237 r12238 1 #!/usr/ local/bin/perl -w1 #!/usr/bin/perl 2 2 3 3 # This is a utility that searches out "DECLARE_STACK_OF()" -
src/router/openssl/util/pod2man.pl
r12237 r12238 1 : #!/usr/bin/perl-5.005 1 #!/usr/bin/perl 2 2 eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' 3 3 if $running_under_some_shell; -
src/router/openssl/util/selftest.pl
r12237 r12238 1 #!/usr/ local/bin/perl -w1 #!/usr/bin/perl 2 2 # 3 3 # Run the test suite and generate a report
Note: See TracChangeset
for help on using the changeset viewer.
