diff options
| author | miod <> | 2014-04-22 20:31:38 +0000 |
|---|---|---|
| committer | miod <> | 2014-04-22 20:31:38 +0000 |
| commit | ccd10d4d23f7a3754a02c017e32f26716e75824a (patch) | |
| tree | 4598ce10bcfadfefbee541f6f4d2d7f25b1762a7 /src | |
| parent | 21f6cbfa0c48cb2e77b3e67ca01577d642b52247 (diff) | |
| download | openbsd-ccd10d4d23f7a3754a02c017e32f26716e75824a.tar.gz openbsd-ccd10d4d23f7a3754a02c017e32f26716e75824a.tar.bz2 openbsd-ccd10d4d23f7a3754a02c017e32f26716e75824a.zip | |
Remove meat which either duplicates code found in apps/, or is only of value
for 20th century historians, and can be put in the Attic.
Diffstat (limited to 'src')
40 files changed, 0 insertions, 8459 deletions
diff --git a/src/lib/libcrypto/bf/bf_opts.c b/src/lib/libcrypto/bf/bf_opts.c deleted file mode 100644 index da7a48740e..0000000000 --- a/src/lib/libcrypto/bf/bf_opts.c +++ /dev/null | |||
| @@ -1,330 +0,0 @@ | |||
| 1 | /* crypto/bf/bf_opts.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* define PART1, PART2, PART3 or PART4 to build only with a few of the options. | ||
| 60 | * This is for machines with 64k code segment size restrictions. */ | ||
| 61 | |||
| 62 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 63 | #define TIMES | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #include <stdio.h> | ||
| 67 | |||
| 68 | #include <openssl/e_os2.h> | ||
| 69 | #include <unistd.h> | ||
| 70 | |||
| 71 | #ifndef OPENSSL_SYS_NETWARE | ||
| 72 | #include <signal.h> | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #ifndef _IRIX | ||
| 76 | #include <time.h> | ||
| 77 | #endif | ||
| 78 | #ifdef TIMES | ||
| 79 | #include <sys/types.h> | ||
| 80 | #include <sys/times.h> | ||
| 81 | #endif | ||
| 82 | |||
| 83 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 84 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 85 | undefine TIMES, since that tells the rest of the program how things | ||
| 86 | should be handled. -- Richard Levitte */ | ||
| 87 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 88 | #undef TIMES | ||
| 89 | #endif | ||
| 90 | |||
| 91 | #ifndef TIMES | ||
| 92 | #include <sys/timeb.h> | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #if defined(sun) || defined(__ultrix) | ||
| 96 | #define _POSIX_SOURCE | ||
| 97 | #include <limits.h> | ||
| 98 | #include <sys/param.h> | ||
| 99 | #endif | ||
| 100 | |||
| 101 | #include <openssl/blowfish.h> | ||
| 102 | |||
| 103 | #define BF_DEFAULT_OPTIONS | ||
| 104 | |||
| 105 | #undef BF_ENC | ||
| 106 | #define BF_encrypt BF_encrypt_normal | ||
| 107 | #undef HEADER_BF_LOCL_H | ||
| 108 | #include "bf_enc.c" | ||
| 109 | |||
| 110 | #define BF_PTR | ||
| 111 | #undef BF_PTR2 | ||
| 112 | #undef BF_ENC | ||
| 113 | #undef BF_encrypt | ||
| 114 | #define BF_encrypt BF_encrypt_ptr | ||
| 115 | #undef HEADER_BF_LOCL_H | ||
| 116 | #include "bf_enc.c" | ||
| 117 | |||
| 118 | #undef BF_PTR | ||
| 119 | #define BF_PTR2 | ||
| 120 | #undef BF_ENC | ||
| 121 | #undef BF_encrypt | ||
| 122 | #define BF_encrypt BF_encrypt_ptr2 | ||
| 123 | #undef HEADER_BF_LOCL_H | ||
| 124 | #include "bf_enc.c" | ||
| 125 | |||
| 126 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 127 | #ifndef HZ | ||
| 128 | # ifndef CLK_TCK | ||
| 129 | # ifndef _BSD_CLK_TCK_ /* FreeBSD fix */ | ||
| 130 | # define HZ 100.0 | ||
| 131 | # else /* _BSD_CLK_TCK_ */ | ||
| 132 | # define HZ ((double)_BSD_CLK_TCK_) | ||
| 133 | # endif | ||
| 134 | # else /* CLK_TCK */ | ||
| 135 | # define HZ ((double)CLK_TCK) | ||
| 136 | # endif | ||
| 137 | #endif | ||
| 138 | |||
| 139 | #define BUFSIZE ((long)1024) | ||
| 140 | long run=0; | ||
| 141 | |||
| 142 | double Time_F(int s); | ||
| 143 | #ifdef SIGALRM | ||
| 144 | #if defined(__STDC__) || defined(sgi) | ||
| 145 | #define SIGRETTYPE void | ||
| 146 | #else | ||
| 147 | #define SIGRETTYPE int | ||
| 148 | #endif | ||
| 149 | |||
| 150 | SIGRETTYPE sig_done(int sig); | ||
| 151 | SIGRETTYPE sig_done(int sig) | ||
| 152 | { | ||
| 153 | signal(SIGALRM,sig_done); | ||
| 154 | run=0; | ||
| 155 | #ifdef LINT | ||
| 156 | sig=sig; | ||
| 157 | #endif | ||
| 158 | } | ||
| 159 | #endif | ||
| 160 | |||
| 161 | #define START 0 | ||
| 162 | #define STOP 1 | ||
| 163 | |||
| 164 | double Time_F(int s) | ||
| 165 | { | ||
| 166 | double ret; | ||
| 167 | #ifdef TIMES | ||
| 168 | static struct tms tstart,tend; | ||
| 169 | |||
| 170 | if (s == START) | ||
| 171 | { | ||
| 172 | times(&tstart); | ||
| 173 | return(0); | ||
| 174 | } | ||
| 175 | else | ||
| 176 | { | ||
| 177 | times(&tend); | ||
| 178 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 179 | return((ret == 0.0)?1e-6:ret); | ||
| 180 | } | ||
| 181 | #else /* !times() */ | ||
| 182 | static struct timeb tstart,tend; | ||
| 183 | long i; | ||
| 184 | |||
| 185 | if (s == START) | ||
| 186 | { | ||
| 187 | ftime(&tstart); | ||
| 188 | return(0); | ||
| 189 | } | ||
| 190 | else | ||
| 191 | { | ||
| 192 | ftime(&tend); | ||
| 193 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 194 | ret=((double)(tend.time-tstart.time))+((double)i)/1000.0; | ||
| 195 | return((ret == 0.0)?1e-6:ret); | ||
| 196 | } | ||
| 197 | #endif | ||
| 198 | } | ||
| 199 | |||
| 200 | #ifdef SIGALRM | ||
| 201 | #define print_name(name) fprintf(stderr,"Doing %s's for 10 seconds\n",name); alarm(10); | ||
| 202 | #else | ||
| 203 | #define print_name(name) fprintf(stderr,"Doing %s %ld times\n",name,cb); | ||
| 204 | #endif | ||
| 205 | |||
| 206 | #define time_it(func,name,index) \ | ||
| 207 | print_name(name); \ | ||
| 208 | Time_F(START); \ | ||
| 209 | for (count=0,run=1; COND(cb); count+=4) \ | ||
| 210 | { \ | ||
| 211 | unsigned long d[2]; \ | ||
| 212 | func(d,&sch); \ | ||
| 213 | func(d,&sch); \ | ||
| 214 | func(d,&sch); \ | ||
| 215 | func(d,&sch); \ | ||
| 216 | } \ | ||
| 217 | tm[index]=Time_F(STOP); \ | ||
| 218 | fprintf(stderr,"%ld %s's in %.2f second\n",count,name,tm[index]); \ | ||
| 219 | tm[index]=((double)COUNT(cb))/tm[index]; | ||
| 220 | |||
| 221 | #define print_it(name,index) \ | ||
| 222 | fprintf(stderr,"%s bytes per sec = %12.2f (%5.1fuS)\n",name, \ | ||
| 223 | tm[index]*8,1.0e6/tm[index]); | ||
| 224 | |||
| 225 | int main(int argc, char **argv) | ||
| 226 | { | ||
| 227 | long count; | ||
| 228 | static unsigned char buf[BUFSIZE]; | ||
| 229 | static char key[16]={ 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, | ||
| 230 | 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; | ||
| 231 | BF_KEY sch; | ||
| 232 | double d,tm[16],max=0; | ||
| 233 | int rank[16]; | ||
| 234 | char *str[16]; | ||
| 235 | int max_idx=0,i,num=0,j; | ||
| 236 | #ifndef SIGALARM | ||
| 237 | long ca,cb,cc,cd,ce; | ||
| 238 | #endif | ||
| 239 | |||
| 240 | for (i=0; i<12; i++) | ||
| 241 | { | ||
| 242 | tm[i]=0.0; | ||
| 243 | rank[i]=0; | ||
| 244 | } | ||
| 245 | |||
| 246 | #ifndef TIMES | ||
| 247 | fprintf(stderr,"To get the most accurate results, try to run this\n"); | ||
| 248 | fprintf(stderr,"program when this computer is idle.\n"); | ||
| 249 | #endif | ||
| 250 | |||
| 251 | BF_set_key(&sch,16,key); | ||
| 252 | |||
| 253 | #ifndef SIGALRM | ||
| 254 | fprintf(stderr,"First we calculate the approximate speed ...\n"); | ||
| 255 | count=10; | ||
| 256 | do { | ||
| 257 | long i; | ||
| 258 | unsigned long data[2]; | ||
| 259 | |||
| 260 | count*=2; | ||
| 261 | Time_F(START); | ||
| 262 | for (i=count; i; i--) | ||
| 263 | BF_encrypt(data,&sch); | ||
| 264 | d=Time_F(STOP); | ||
| 265 | } while (d < 3.0); | ||
| 266 | ca=count; | ||
| 267 | cb=count*3; | ||
| 268 | cc=count*3*8/BUFSIZE+1; | ||
| 269 | cd=count*8/BUFSIZE+1; | ||
| 270 | |||
| 271 | ce=count/20+1; | ||
| 272 | #define COND(d) (count != (d)) | ||
| 273 | #define COUNT(d) (d) | ||
| 274 | #else | ||
| 275 | #define COND(c) (run) | ||
| 276 | #define COUNT(d) (count) | ||
| 277 | signal(SIGALRM,sig_done); | ||
| 278 | alarm(10); | ||
| 279 | #endif | ||
| 280 | |||
| 281 | time_it(BF_encrypt_normal, "BF_encrypt_normal ", 0); | ||
| 282 | time_it(BF_encrypt_ptr, "BF_encrypt_ptr ", 1); | ||
| 283 | time_it(BF_encrypt_ptr2, "BF_encrypt_ptr2 ", 2); | ||
| 284 | num+=3; | ||
| 285 | |||
| 286 | str[0]="<nothing>"; | ||
| 287 | print_it("BF_encrypt_normal ",0); | ||
| 288 | max=tm[0]; | ||
| 289 | max_idx=0; | ||
| 290 | str[1]="ptr "; | ||
| 291 | print_it("BF_encrypt_ptr ",1); | ||
| 292 | if (max < tm[1]) { max=tm[1]; max_idx=1; } | ||
| 293 | str[2]="ptr2 "; | ||
| 294 | print_it("BF_encrypt_ptr2 ",2); | ||
| 295 | if (max < tm[2]) { max=tm[2]; max_idx=2; } | ||
| 296 | |||
| 297 | printf("options BF ecb/s\n"); | ||
| 298 | printf("%s %12.2f 100.0%%\n",str[max_idx],tm[max_idx]); | ||
| 299 | d=tm[max_idx]; | ||
| 300 | tm[max_idx]= -2.0; | ||
| 301 | max= -1.0; | ||
| 302 | for (;;) | ||
| 303 | { | ||
| 304 | for (i=0; i<3; i++) | ||
| 305 | { | ||
| 306 | if (max < tm[i]) { max=tm[i]; j=i; } | ||
| 307 | } | ||
| 308 | if (max < 0.0) break; | ||
| 309 | printf("%s %12.2f %4.1f%%\n",str[j],tm[j],tm[j]/d*100.0); | ||
| 310 | tm[j]= -2.0; | ||
| 311 | max= -1.0; | ||
| 312 | } | ||
| 313 | |||
| 314 | switch (max_idx) | ||
| 315 | { | ||
| 316 | case 0: | ||
| 317 | printf("-DBF_DEFAULT_OPTIONS\n"); | ||
| 318 | break; | ||
| 319 | case 1: | ||
| 320 | printf("-DBF_PTR\n"); | ||
| 321 | break; | ||
| 322 | case 2: | ||
| 323 | printf("-DBF_PTR2\n"); | ||
| 324 | break; | ||
| 325 | } | ||
| 326 | exit(0); | ||
| 327 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
| 328 | return(0); | ||
| 329 | #endif | ||
| 330 | } | ||
diff --git a/src/lib/libcrypto/bn/bn.mul b/src/lib/libcrypto/bn/bn.mul deleted file mode 100644 index 9728870d38..0000000000 --- a/src/lib/libcrypto/bn/bn.mul +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | We need | ||
| 2 | |||
| 3 | * bn_mul_comba8 | ||
| 4 | * bn_mul_comba4 | ||
| 5 | * bn_mul_normal | ||
| 6 | * bn_mul_recursive | ||
| 7 | |||
| 8 | * bn_sqr_comba8 | ||
| 9 | * bn_sqr_comba4 | ||
| 10 | bn_sqr_normal -> BN_sqr | ||
| 11 | * bn_sqr_recursive | ||
| 12 | |||
| 13 | * bn_mul_low_recursive | ||
| 14 | * bn_mul_low_normal | ||
| 15 | * bn_mul_high | ||
| 16 | |||
| 17 | * bn_mul_part_recursive # symetric but not power of 2 | ||
| 18 | |||
| 19 | bn_mul_asymetric_recursive # uneven, but do the chop up. | ||
diff --git a/src/lib/libcrypto/bn/bnspeed.c b/src/lib/libcrypto/bn/bnspeed.c deleted file mode 100644 index b554ac8cf8..0000000000 --- a/src/lib/libcrypto/bn/bnspeed.c +++ /dev/null | |||
| @@ -1,233 +0,0 @@ | |||
| 1 | /* unused */ | ||
| 2 | |||
| 3 | /* crypto/bn/bnspeed.c */ | ||
| 4 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * This package is an SSL implementation written | ||
| 8 | * by Eric Young (eay@cryptsoft.com). | ||
| 9 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 10 | * | ||
| 11 | * This library is free for commercial and non-commercial use as long as | ||
| 12 | * the following conditions are aheared to. The following conditions | ||
| 13 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 14 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 15 | * included with this distribution is covered by the same copyright terms | ||
| 16 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 17 | * | ||
| 18 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 19 | * the code are not to be removed. | ||
| 20 | * If this package is used in a product, Eric Young should be given attribution | ||
| 21 | * as the author of the parts of the library used. | ||
| 22 | * This can be in the form of a textual message at program startup or | ||
| 23 | * in documentation (online or textual) provided with the package. | ||
| 24 | * | ||
| 25 | * Redistribution and use in source and binary forms, with or without | ||
| 26 | * modification, are permitted provided that the following conditions | ||
| 27 | * are met: | ||
| 28 | * 1. Redistributions of source code must retain the copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer. | ||
| 30 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 31 | * notice, this list of conditions and the following disclaimer in the | ||
| 32 | * documentation and/or other materials provided with the distribution. | ||
| 33 | * 3. All advertising materials mentioning features or use of this software | ||
| 34 | * must display the following acknowledgement: | ||
| 35 | * "This product includes cryptographic software written by | ||
| 36 | * Eric Young (eay@cryptsoft.com)" | ||
| 37 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 38 | * being used are not cryptographic related :-). | ||
| 39 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 40 | * the apps directory (application code) you must include an acknowledgement: | ||
| 41 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 42 | * | ||
| 43 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 44 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 45 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 46 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 47 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 48 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 49 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 50 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 51 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 52 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 53 | * SUCH DAMAGE. | ||
| 54 | * | ||
| 55 | * The licence and distribution terms for any publically available version or | ||
| 56 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 57 | * copied and put under another distribution licence | ||
| 58 | * [including the GNU Public Licence.] | ||
| 59 | */ | ||
| 60 | |||
| 61 | /* most of this code has been pilfered from my libdes speed.c program */ | ||
| 62 | |||
| 63 | #define BASENUM 1000000 | ||
| 64 | #undef PROG | ||
| 65 | #define PROG bnspeed_main | ||
| 66 | |||
| 67 | #include <stdio.h> | ||
| 68 | #include <stdlib.h> | ||
| 69 | #include <signal.h> | ||
| 70 | #include <string.h> | ||
| 71 | #include <openssl/crypto.h> | ||
| 72 | #include <openssl/err.h> | ||
| 73 | |||
| 74 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 75 | #define TIMES | ||
| 76 | #endif | ||
| 77 | |||
| 78 | #ifndef _IRIX | ||
| 79 | #include <time.h> | ||
| 80 | #endif | ||
| 81 | #ifdef TIMES | ||
| 82 | #include <sys/types.h> | ||
| 83 | #include <sys/times.h> | ||
| 84 | #endif | ||
| 85 | |||
| 86 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 87 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 88 | undefine TIMES, since that tells the rest of the program how things | ||
| 89 | should be handled. -- Richard Levitte */ | ||
| 90 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 91 | #undef TIMES | ||
| 92 | #endif | ||
| 93 | |||
| 94 | #ifndef TIMES | ||
| 95 | #include <sys/timeb.h> | ||
| 96 | #endif | ||
| 97 | |||
| 98 | #if defined(sun) || defined(__ultrix) | ||
| 99 | #define _POSIX_SOURCE | ||
| 100 | #include <limits.h> | ||
| 101 | #include <sys/param.h> | ||
| 102 | #endif | ||
| 103 | |||
| 104 | #include <openssl/bn.h> | ||
| 105 | #include <openssl/x509.h> | ||
| 106 | |||
| 107 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 108 | #ifndef HZ | ||
| 109 | # ifndef CLK_TCK | ||
| 110 | # ifndef _BSD_CLK_TCK_ /* FreeBSD hack */ | ||
| 111 | # define HZ 100.0 | ||
| 112 | # else /* _BSD_CLK_TCK_ */ | ||
| 113 | # define HZ ((double)_BSD_CLK_TCK_) | ||
| 114 | # endif | ||
| 115 | # else /* CLK_TCK */ | ||
| 116 | # define HZ ((double)CLK_TCK) | ||
| 117 | # endif | ||
| 118 | #endif | ||
| 119 | |||
| 120 | #undef BUFSIZE | ||
| 121 | #define BUFSIZE ((long)1024*8) | ||
| 122 | int run=0; | ||
| 123 | |||
| 124 | static double Time_F(int s); | ||
| 125 | #define START 0 | ||
| 126 | #define STOP 1 | ||
| 127 | |||
| 128 | static double Time_F(int s) | ||
| 129 | { | ||
| 130 | double ret; | ||
| 131 | #ifdef TIMES | ||
| 132 | static struct tms tstart,tend; | ||
| 133 | |||
| 134 | if (s == START) | ||
| 135 | { | ||
| 136 | times(&tstart); | ||
| 137 | return(0); | ||
| 138 | } | ||
| 139 | else | ||
| 140 | { | ||
| 141 | times(&tend); | ||
| 142 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 143 | return((ret < 1e-3)?1e-3:ret); | ||
| 144 | } | ||
| 145 | #else /* !times() */ | ||
| 146 | static struct timeb tstart,tend; | ||
| 147 | long i; | ||
| 148 | |||
| 149 | if (s == START) | ||
| 150 | { | ||
| 151 | ftime(&tstart); | ||
| 152 | return(0); | ||
| 153 | } | ||
| 154 | else | ||
| 155 | { | ||
| 156 | ftime(&tend); | ||
| 157 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 158 | ret=((double)(tend.time-tstart.time))+((double)i)/1000.0; | ||
| 159 | return((ret < 0.001)?0.001:ret); | ||
| 160 | } | ||
| 161 | #endif | ||
| 162 | } | ||
| 163 | |||
| 164 | #define NUM_SIZES 5 | ||
| 165 | static int sizes[NUM_SIZES]={128,256,512,1024,2048}; | ||
| 166 | /*static int sizes[NUM_SIZES]={59,179,299,419,539}; */ | ||
| 167 | |||
| 168 | void do_mul(BIGNUM *r,BIGNUM *a,BIGNUM *b,BN_CTX *ctx); | ||
| 169 | |||
| 170 | int main(int argc, char **argv) | ||
| 171 | { | ||
| 172 | BN_CTX *ctx; | ||
| 173 | BIGNUM a,b,c; | ||
| 174 | |||
| 175 | ctx=BN_CTX_new(); | ||
| 176 | BN_init(&a); | ||
| 177 | BN_init(&b); | ||
| 178 | BN_init(&c); | ||
| 179 | |||
| 180 | do_mul(&a,&b,&c,ctx); | ||
| 181 | } | ||
| 182 | |||
| 183 | void do_mul(BIGNUM *r, BIGNUM *a, BIGNUM *b, BN_CTX *ctx) | ||
| 184 | { | ||
| 185 | int i,j,k; | ||
| 186 | double tm; | ||
| 187 | long num; | ||
| 188 | |||
| 189 | for (i=0; i<NUM_SIZES; i++) | ||
| 190 | { | ||
| 191 | num=BASENUM; | ||
| 192 | if (i) num/=(i*3); | ||
| 193 | BN_rand(a,sizes[i],1,0); | ||
| 194 | for (j=i; j<NUM_SIZES; j++) | ||
| 195 | { | ||
| 196 | BN_rand(b,sizes[j],1,0); | ||
| 197 | Time_F(START); | ||
| 198 | for (k=0; k<num; k++) | ||
| 199 | BN_mul(r,b,a,ctx); | ||
| 200 | tm=Time_F(STOP); | ||
| 201 | printf("mul %4d x %4d -> %8.3fms\n",sizes[i],sizes[j],tm*1000.0/num); | ||
| 202 | } | ||
| 203 | } | ||
| 204 | |||
| 205 | for (i=0; i<NUM_SIZES; i++) | ||
| 206 | { | ||
| 207 | num=BASENUM; | ||
| 208 | if (i) num/=(i*3); | ||
| 209 | BN_rand(a,sizes[i],1,0); | ||
| 210 | Time_F(START); | ||
| 211 | for (k=0; k<num; k++) | ||
| 212 | BN_sqr(r,a,ctx); | ||
| 213 | tm=Time_F(STOP); | ||
| 214 | printf("sqr %4d x %4d -> %8.3fms\n",sizes[i],sizes[i],tm*1000.0/num); | ||
| 215 | } | ||
| 216 | |||
| 217 | for (i=0; i<NUM_SIZES; i++) | ||
| 218 | { | ||
| 219 | num=BASENUM/10; | ||
| 220 | if (i) num/=(i*3); | ||
| 221 | BN_rand(a,sizes[i]-1,1,0); | ||
| 222 | for (j=i; j<NUM_SIZES; j++) | ||
| 223 | { | ||
| 224 | BN_rand(b,sizes[j],1,0); | ||
| 225 | Time_F(START); | ||
| 226 | for (k=0; k<100000; k++) | ||
| 227 | BN_div(r, NULL, b, a,ctx); | ||
| 228 | tm=Time_F(STOP); | ||
| 229 | printf("div %4d / %4d -> %8.3fms\n",sizes[j],sizes[i]-1,tm*1000.0/num); | ||
| 230 | } | ||
| 231 | } | ||
| 232 | } | ||
| 233 | |||
diff --git a/src/lib/libcrypto/bn/exp.c b/src/lib/libcrypto/bn/exp.c deleted file mode 100644 index 4865b0ef74..0000000000 --- a/src/lib/libcrypto/bn/exp.c +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | /* unused */ | ||
| 2 | |||
| 3 | #include <stdio.h> | ||
| 4 | #include <openssl/tmdiff.h> | ||
| 5 | #include "bn_lcl.h" | ||
| 6 | |||
| 7 | #define SIZE 256 | ||
| 8 | #define NUM (8*8*8) | ||
| 9 | #define MOD (8*8*8*8*8) | ||
| 10 | |||
| 11 | main(argc,argv) | ||
| 12 | int argc; | ||
| 13 | char *argv[]; | ||
| 14 | { | ||
| 15 | BN_CTX ctx; | ||
| 16 | BIGNUM a,b,c,r,rr,t,l; | ||
| 17 | int j,i,size=SIZE,num=NUM,mod=MOD; | ||
| 18 | char *start,*end; | ||
| 19 | BN_MONT_CTX mont; | ||
| 20 | double d,md; | ||
| 21 | |||
| 22 | BN_MONT_CTX_init(&mont); | ||
| 23 | BN_CTX_init(&ctx); | ||
| 24 | BN_init(&a); | ||
| 25 | BN_init(&b); | ||
| 26 | BN_init(&c); | ||
| 27 | BN_init(&r); | ||
| 28 | |||
| 29 | start=ms_time_new(); | ||
| 30 | end=ms_time_new(); | ||
| 31 | while (size <= 1024*8) | ||
| 32 | { | ||
| 33 | BN_rand(&a,size,0,0); | ||
| 34 | BN_rand(&b,size,1,0); | ||
| 35 | BN_rand(&c,size,0,1); | ||
| 36 | |||
| 37 | BN_mod(&a,&a,&c,&ctx); | ||
| 38 | |||
| 39 | ms_time_get(start); | ||
| 40 | for (i=0; i<10; i++) | ||
| 41 | BN_MONT_CTX_set(&mont,&c,&ctx); | ||
| 42 | ms_time_get(end); | ||
| 43 | md=ms_time_diff(start,end); | ||
| 44 | |||
| 45 | ms_time_get(start); | ||
| 46 | for (i=0; i<num; i++) | ||
| 47 | { | ||
| 48 | /* bn_mull(&r,&a,&b,&ctx); */ | ||
| 49 | /* BN_sqr(&r,&a,&ctx); */ | ||
| 50 | BN_mod_exp_mont(&r,&a,&b,&c,&ctx,&mont); | ||
| 51 | } | ||
| 52 | ms_time_get(end); | ||
| 53 | d=ms_time_diff(start,end)/* *50/33 */; | ||
| 54 | printf("%5d bit:%6.2f %6d %6.4f %4d m_set(%5.4f)\n",size, | ||
| 55 | d,num,d/num,(int)((d/num)*mod),md/10.0); | ||
| 56 | num/=8; | ||
| 57 | mod/=8; | ||
| 58 | if (num <= 0) num=1; | ||
| 59 | size*=2; | ||
| 60 | } | ||
| 61 | |||
| 62 | } | ||
diff --git a/src/lib/libcrypto/bn/expspeed.c b/src/lib/libcrypto/bn/expspeed.c deleted file mode 100644 index 1b434db1ab..0000000000 --- a/src/lib/libcrypto/bn/expspeed.c +++ /dev/null | |||
| @@ -1,347 +0,0 @@ | |||
| 1 | /* unused */ | ||
| 2 | |||
| 3 | /* crypto/bn/expspeed.c */ | ||
| 4 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * This package is an SSL implementation written | ||
| 8 | * by Eric Young (eay@cryptsoft.com). | ||
| 9 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 10 | * | ||
| 11 | * This library is free for commercial and non-commercial use as long as | ||
| 12 | * the following conditions are aheared to. The following conditions | ||
| 13 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 14 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 15 | * included with this distribution is covered by the same copyright terms | ||
| 16 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 17 | * | ||
| 18 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 19 | * the code are not to be removed. | ||
| 20 | * If this package is used in a product, Eric Young should be given attribution | ||
| 21 | * as the author of the parts of the library used. | ||
| 22 | * This can be in the form of a textual message at program startup or | ||
| 23 | * in documentation (online or textual) provided with the package. | ||
| 24 | * | ||
| 25 | * Redistribution and use in source and binary forms, with or without | ||
| 26 | * modification, are permitted provided that the following conditions | ||
| 27 | * are met: | ||
| 28 | * 1. Redistributions of source code must retain the copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer. | ||
| 30 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 31 | * notice, this list of conditions and the following disclaimer in the | ||
| 32 | * documentation and/or other materials provided with the distribution. | ||
| 33 | * 3. All advertising materials mentioning features or use of this software | ||
| 34 | * must display the following acknowledgement: | ||
| 35 | * "This product includes cryptographic software written by | ||
| 36 | * Eric Young (eay@cryptsoft.com)" | ||
| 37 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 38 | * being used are not cryptographic related :-). | ||
| 39 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 40 | * the apps directory (application code) you must include an acknowledgement: | ||
| 41 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 42 | * | ||
| 43 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 44 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 45 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 46 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 47 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 48 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 49 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 50 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 51 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 52 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 53 | * SUCH DAMAGE. | ||
| 54 | * | ||
| 55 | * The licence and distribution terms for any publically available version or | ||
| 56 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 57 | * copied and put under another distribution licence | ||
| 58 | * [including the GNU Public Licence.] | ||
| 59 | */ | ||
| 60 | |||
| 61 | /* most of this code has been pilfered from my libdes speed.c program */ | ||
| 62 | |||
| 63 | #define BASENUM 5000 | ||
| 64 | #define NUM_START 0 | ||
| 65 | |||
| 66 | |||
| 67 | /* determine timings for modexp, modmul, modsqr, gcd, Kronecker symbol, | ||
| 68 | * modular inverse, or modular square roots */ | ||
| 69 | #define TEST_EXP | ||
| 70 | #undef TEST_MUL | ||
| 71 | #undef TEST_SQR | ||
| 72 | #undef TEST_GCD | ||
| 73 | #undef TEST_KRON | ||
| 74 | #undef TEST_INV | ||
| 75 | #undef TEST_SQRT | ||
| 76 | #define P_MOD_64 9 /* least significant 6 bits for prime to be used for BN_sqrt timings */ | ||
| 77 | |||
| 78 | #if defined(TEST_EXP) + defined(TEST_MUL) + defined(TEST_SQR) + defined(TEST_GCD) + defined(TEST_KRON) + defined(TEST_INV) +defined(TEST_SQRT) != 1 | ||
| 79 | # error "choose one test" | ||
| 80 | #endif | ||
| 81 | |||
| 82 | #if defined(TEST_INV) || defined(TEST_SQRT) | ||
| 83 | # define C_PRIME | ||
| 84 | static void genprime_cb(int p, int n, void *arg); | ||
| 85 | #endif | ||
| 86 | |||
| 87 | |||
| 88 | |||
| 89 | #undef PROG | ||
| 90 | #define PROG bnspeed_main | ||
| 91 | |||
| 92 | #include <stdio.h> | ||
| 93 | #include <stdlib.h> | ||
| 94 | #include <signal.h> | ||
| 95 | #include <string.h> | ||
| 96 | #include <openssl/crypto.h> | ||
| 97 | #include <openssl/err.h> | ||
| 98 | #include <openssl/rand.h> | ||
| 99 | |||
| 100 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 101 | #define TIMES | ||
| 102 | #endif | ||
| 103 | |||
| 104 | #ifndef _IRIX | ||
| 105 | #include <time.h> | ||
| 106 | #endif | ||
| 107 | #ifdef TIMES | ||
| 108 | #include <sys/types.h> | ||
| 109 | #include <sys/times.h> | ||
| 110 | #endif | ||
| 111 | |||
| 112 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 113 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 114 | undefine TIMES, since that tells the rest of the program how things | ||
| 115 | should be handled. -- Richard Levitte */ | ||
| 116 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 117 | #undef TIMES | ||
| 118 | #endif | ||
| 119 | |||
| 120 | #ifndef TIMES | ||
| 121 | #include <sys/timeb.h> | ||
| 122 | #endif | ||
| 123 | |||
| 124 | #if defined(sun) || defined(__ultrix) | ||
| 125 | #define _POSIX_SOURCE | ||
| 126 | #include <limits.h> | ||
| 127 | #include <sys/param.h> | ||
| 128 | #endif | ||
| 129 | |||
| 130 | #include <openssl/bn.h> | ||
| 131 | #include <openssl/x509.h> | ||
| 132 | |||
| 133 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 134 | #ifndef HZ | ||
| 135 | # ifndef CLK_TCK | ||
| 136 | # ifndef _BSD_CLK_TCK_ /* FreeBSD hack */ | ||
| 137 | # define HZ 100.0 | ||
| 138 | # else /* _BSD_CLK_TCK_ */ | ||
| 139 | # define HZ ((double)_BSD_CLK_TCK_) | ||
| 140 | # endif | ||
| 141 | # else /* CLK_TCK */ | ||
| 142 | # define HZ ((double)CLK_TCK) | ||
| 143 | # endif | ||
| 144 | #endif | ||
| 145 | |||
| 146 | #undef BUFSIZE | ||
| 147 | #define BUFSIZE ((long)1024*8) | ||
| 148 | int run=0; | ||
| 149 | |||
| 150 | static double Time_F(int s); | ||
| 151 | #define START 0 | ||
| 152 | #define STOP 1 | ||
| 153 | |||
| 154 | static double Time_F(int s) | ||
| 155 | { | ||
| 156 | double ret; | ||
| 157 | #ifdef TIMES | ||
| 158 | static struct tms tstart,tend; | ||
| 159 | |||
| 160 | if (s == START) | ||
| 161 | { | ||
| 162 | times(&tstart); | ||
| 163 | return(0); | ||
| 164 | } | ||
| 165 | else | ||
| 166 | { | ||
| 167 | times(&tend); | ||
| 168 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 169 | return((ret < 1e-3)?1e-3:ret); | ||
| 170 | } | ||
| 171 | #else /* !times() */ | ||
| 172 | static struct timeb tstart,tend; | ||
| 173 | long i; | ||
| 174 | |||
| 175 | if (s == START) | ||
| 176 | { | ||
| 177 | ftime(&tstart); | ||
| 178 | return(0); | ||
| 179 | } | ||
| 180 | else | ||
| 181 | { | ||
| 182 | ftime(&tend); | ||
| 183 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 184 | ret=((double)(tend.time-tstart.time))+((double)i)/1000.0; | ||
| 185 | return((ret < 0.001)?0.001:ret); | ||
| 186 | } | ||
| 187 | #endif | ||
| 188 | } | ||
| 189 | |||
| 190 | #define NUM_SIZES 7 | ||
| 191 | #if NUM_START > NUM_SIZES | ||
| 192 | # error "NUM_START > NUM_SIZES" | ||
| 193 | #endif | ||
| 194 | static int sizes[NUM_SIZES]={128,256,512,1024,2048,4096,8192}; | ||
| 195 | static int mul_c[NUM_SIZES]={8*8*8*8*8*8,8*8*8*8*8,8*8*8*8,8*8*8,8*8,8,1}; | ||
| 196 | /*static int sizes[NUM_SIZES]={59,179,299,419,539}; */ | ||
| 197 | |||
| 198 | void do_mul_exp(BIGNUM *r,BIGNUM *a,BIGNUM *b,BIGNUM *c,BN_CTX *ctx); | ||
| 199 | |||
| 200 | int main(int argc, char **argv) | ||
| 201 | { | ||
| 202 | BN_CTX *ctx; | ||
| 203 | BIGNUM *a,*b,*c,*r; | ||
| 204 | |||
| 205 | #if 1 | ||
| 206 | if (!CRYPTO_set_mem_debug_functions(0,0,0,0,0)) | ||
| 207 | abort(); | ||
| 208 | #endif | ||
| 209 | |||
| 210 | ctx=BN_CTX_new(); | ||
| 211 | a=BN_new(); | ||
| 212 | b=BN_new(); | ||
| 213 | c=BN_new(); | ||
| 214 | r=BN_new(); | ||
| 215 | |||
| 216 | do_mul_exp(r,a,b,c,ctx); | ||
| 217 | return 0; | ||
| 218 | } | ||
| 219 | |||
| 220 | void do_mul_exp(BIGNUM *r, BIGNUM *a, BIGNUM *b, BIGNUM *c, BN_CTX *ctx) | ||
| 221 | { | ||
| 222 | int i,k; | ||
| 223 | double tm; | ||
| 224 | long num; | ||
| 225 | |||
| 226 | num=BASENUM; | ||
| 227 | for (i=NUM_START; i<NUM_SIZES; i++) | ||
| 228 | { | ||
| 229 | #ifdef C_PRIME | ||
| 230 | # ifdef TEST_SQRT | ||
| 231 | if (!BN_set_word(a, 64)) goto err; | ||
| 232 | if (!BN_set_word(b, P_MOD_64)) goto err; | ||
| 233 | # define ADD a | ||
| 234 | # define REM b | ||
| 235 | # else | ||
| 236 | # define ADD NULL | ||
| 237 | # define REM NULL | ||
| 238 | # endif | ||
| 239 | if (!BN_generate_prime(c,sizes[i],0,ADD,REM,genprime_cb,NULL)) goto err; | ||
| 240 | putc('\n', stderr); | ||
| 241 | fflush(stderr); | ||
| 242 | #endif | ||
| 243 | |||
| 244 | for (k=0; k<num; k++) | ||
| 245 | { | ||
| 246 | if (k%50 == 0) /* Average over num/50 different choices of random numbers. */ | ||
| 247 | { | ||
| 248 | if (!BN_pseudo_rand(a,sizes[i],1,0)) goto err; | ||
| 249 | |||
| 250 | if (!BN_pseudo_rand(b,sizes[i],1,0)) goto err; | ||
| 251 | |||
| 252 | #ifndef C_PRIME | ||
| 253 | if (!BN_pseudo_rand(c,sizes[i],1,1)) goto err; | ||
| 254 | #endif | ||
| 255 | |||
| 256 | #ifdef TEST_SQRT | ||
| 257 | if (!BN_mod_sqr(a,a,c,ctx)) goto err; | ||
| 258 | if (!BN_mod_sqr(b,b,c,ctx)) goto err; | ||
| 259 | #else | ||
| 260 | if (!BN_nnmod(a,a,c,ctx)) goto err; | ||
| 261 | if (!BN_nnmod(b,b,c,ctx)) goto err; | ||
| 262 | #endif | ||
| 263 | |||
| 264 | if (k == 0) | ||
| 265 | Time_F(START); | ||
| 266 | } | ||
| 267 | |||
| 268 | #if defined(TEST_EXP) | ||
| 269 | if (!BN_mod_exp(r,a,b,c,ctx)) goto err; | ||
| 270 | #elif defined(TEST_MUL) | ||
| 271 | { | ||
| 272 | int i = 0; | ||
| 273 | for (i = 0; i < 50; i++) | ||
| 274 | if (!BN_mod_mul(r,a,b,c,ctx)) goto err; | ||
| 275 | } | ||
| 276 | #elif defined(TEST_SQR) | ||
| 277 | { | ||
| 278 | int i = 0; | ||
| 279 | for (i = 0; i < 50; i++) | ||
| 280 | { | ||
| 281 | if (!BN_mod_sqr(r,a,c,ctx)) goto err; | ||
| 282 | if (!BN_mod_sqr(r,b,c,ctx)) goto err; | ||
| 283 | } | ||
| 284 | } | ||
| 285 | #elif defined(TEST_GCD) | ||
| 286 | if (!BN_gcd(r,a,b,ctx)) goto err; | ||
| 287 | if (!BN_gcd(r,b,c,ctx)) goto err; | ||
| 288 | if (!BN_gcd(r,c,a,ctx)) goto err; | ||
| 289 | #elif defined(TEST_KRON) | ||
| 290 | if (-2 == BN_kronecker(a,b,ctx)) goto err; | ||
| 291 | if (-2 == BN_kronecker(b,c,ctx)) goto err; | ||
| 292 | if (-2 == BN_kronecker(c,a,ctx)) goto err; | ||
| 293 | #elif defined(TEST_INV) | ||
| 294 | if (!BN_mod_inverse(r,a,c,ctx)) goto err; | ||
| 295 | if (!BN_mod_inverse(r,b,c,ctx)) goto err; | ||
| 296 | #else /* TEST_SQRT */ | ||
| 297 | if (!BN_mod_sqrt(r,a,c,ctx)) goto err; | ||
| 298 | if (!BN_mod_sqrt(r,b,c,ctx)) goto err; | ||
| 299 | #endif | ||
| 300 | } | ||
| 301 | tm=Time_F(STOP); | ||
| 302 | printf( | ||
| 303 | #if defined(TEST_EXP) | ||
| 304 | "modexp %4d ^ %4d %% %4d" | ||
| 305 | #elif defined(TEST_MUL) | ||
| 306 | "50*modmul %4d %4d %4d" | ||
| 307 | #elif defined(TEST_SQR) | ||
| 308 | "100*modsqr %4d %4d %4d" | ||
| 309 | #elif defined(TEST_GCD) | ||
| 310 | "3*gcd %4d %4d %4d" | ||
| 311 | #elif defined(TEST_KRON) | ||
| 312 | "3*kronecker %4d %4d %4d" | ||
| 313 | #elif defined(TEST_INV) | ||
| 314 | "2*inv %4d %4d mod %4d" | ||
| 315 | #else /* TEST_SQRT */ | ||
| 316 | "2*sqrt [prime == %d (mod 64)] %4d %4d mod %4d" | ||
| 317 | #endif | ||
| 318 | " -> %8.6fms %5.1f (%ld)\n", | ||
| 319 | #ifdef TEST_SQRT | ||
| 320 | P_MOD_64, | ||
| 321 | #endif | ||
| 322 | sizes[i],sizes[i],sizes[i],tm*1000.0/num,tm*mul_c[i]/num, num); | ||
| 323 | num/=7; | ||
| 324 | if (num <= 0) num=1; | ||
| 325 | } | ||
| 326 | return; | ||
| 327 | |||
| 328 | err: | ||
| 329 | ERR_print_errors_fp(stderr); | ||
| 330 | } | ||
| 331 | |||
| 332 | |||
| 333 | #ifdef C_PRIME | ||
| 334 | static void genprime_cb(int p, int n, void *arg) | ||
| 335 | { | ||
| 336 | char c='*'; | ||
| 337 | |||
| 338 | if (p == 0) c='.'; | ||
| 339 | if (p == 1) c='+'; | ||
| 340 | if (p == 2) c='*'; | ||
| 341 | if (p == 3) c='\n'; | ||
| 342 | putc(c, stderr); | ||
| 343 | fflush(stderr); | ||
| 344 | (void)n; | ||
| 345 | (void)arg; | ||
| 346 | } | ||
| 347 | #endif | ||
diff --git a/src/lib/libcrypto/des/FILES0 b/src/lib/libcrypto/des/FILES0 deleted file mode 100644 index 2e8211ad2a..0000000000 --- a/src/lib/libcrypto/des/FILES0 +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | /* General stuff */ | ||
| 2 | COPYRIGHT - Copyright info. | ||
| 3 | FILES - This file. | ||
| 4 | README - What this package is. | ||
| 5 | VERSION - Which version this is and what was changed. | ||
| 6 | |||
| 7 | /* libdes.a source code */ | ||
| 8 | des.h - Public libdes.a header file. | ||
| 9 | ecb_enc.c - des_ecb_encrypt() source, this contains the basic DES code. | ||
| 10 | ecb3_enc.c - des_ecb3_encrypt() source. | ||
| 11 | cbc_ckm.c - des_cbc_cksum() source. | ||
| 12 | cbc_enc.c - des_cbc_encrypt() source. | ||
| 13 | ncbc_enc.c - des_cbc_encrypt() that is 'normal' in that it copies | ||
| 14 | the new iv values back in the passed iv vector. | ||
| 15 | ede_enc.c - des_ede3_cbc_encrypt() cbc mode des using triple DES. | ||
| 16 | cbc3_enc.c - des_3cbc_encrypt() source, don't use this function. | ||
| 17 | cfb_enc.c - des_cfb_encrypt() source. | ||
| 18 | cfb64enc.c - des_cfb64_encrypt() cfb in 64 bit mode but setup to be | ||
| 19 | used as a stream cipher. | ||
| 20 | cfb64ede.c - des_ede3_cfb64_encrypt() cfb in 64 bit mode but setup to be | ||
| 21 | used as a stream cipher and using triple DES. | ||
| 22 | ofb_enc.c - des_cfb_encrypt() source. | ||
| 23 | ofb64_enc.c - des_ofb_encrypt() ofb in 64 bit mode but setup to be | ||
| 24 | used as a stream cipher. | ||
| 25 | ofb64ede.c - des_ede3_ofb64_encrypt() ofb in 64 bit mode but setup to be | ||
| 26 | used as a stream cipher and using triple DES. | ||
| 27 | enc_read.c - des_enc_read() source. | ||
| 28 | enc_writ.c - des_enc_write() source. | ||
| 29 | pcbc_enc.c - des_pcbc_encrypt() source. | ||
| 30 | qud_cksm.c - quad_cksum() source. | ||
| 31 | rand_key.c - des_random_key() source. | ||
| 32 | read_pwd.c - Source for des_read_password() plus related functions. | ||
| 33 | set_key.c - Source for des_set_key(). | ||
| 34 | str2key.c - Covert a string of any length into a key. | ||
| 35 | fcrypt.c - A small, fast version of crypt(3). | ||
| 36 | des_locl.h - Internal libdes.a header file. | ||
| 37 | podd.h - Odd parity tables - used in des_set_key(). | ||
| 38 | sk.h - Lookup tables used in des_set_key(). | ||
| 39 | spr.h - What is left of the S tables - used in ecb_encrypt(). | ||
| 40 | des_ver.h - header file for the external definition of the | ||
| 41 | version string. | ||
| 42 | des.doc - SSLeay documentation for the library. | ||
| 43 | |||
| 44 | |||
diff --git a/src/lib/libcrypto/des/README b/src/lib/libcrypto/des/README deleted file mode 100644 index 621a5ab467..0000000000 --- a/src/lib/libcrypto/des/README +++ /dev/null | |||
| @@ -1,54 +0,0 @@ | |||
| 1 | |||
| 2 | libdes, Version 4.01 10-Jan-97 | ||
| 3 | |||
| 4 | Copyright (c) 1997, Eric Young | ||
| 5 | All rights reserved. | ||
| 6 | |||
| 7 | This program is free software; you can redistribute it and/or modify | ||
| 8 | it under the terms specified in COPYRIGHT. | ||
| 9 | |||
| 10 | -- | ||
| 11 | The primary ftp site for this library is | ||
| 12 | ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/libdes-x.xx.tar.gz | ||
| 13 | libdes is now also shipped with SSLeay. Primary ftp site of | ||
| 14 | ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL/SSLeay-x.x.x.tar.gz | ||
| 15 | |||
| 16 | The best way to build this library is to build it as part of SSLeay. | ||
| 17 | |||
| 18 | This kit builds a DES encryption library and a DES encryption program. | ||
| 19 | It supports ecb, cbc, ofb, cfb, triple ecb, triple cbc, triple ofb, | ||
| 20 | triple cfb, desx, and MIT's pcbc encryption modes and also has a fast | ||
| 21 | implementation of crypt(3). | ||
| 22 | It contains support routines to read keys from a terminal, | ||
| 23 | generate a random key, generate a key from an arbitrary length string, | ||
| 24 | read/write encrypted data from/to a file descriptor. | ||
| 25 | |||
| 26 | The implementation was written so as to conform with the manual entry | ||
| 27 | for the des_crypt(3) library routines from MIT's project Athena. | ||
| 28 | |||
| 29 | destest should be run after compilation to test the des routines. | ||
| 30 | rpw should be run after compilation to test the read password routines. | ||
| 31 | The des program is a replacement for the sun des command. I believe it | ||
| 32 | conforms to the sun version. | ||
| 33 | |||
| 34 | The Imakefile is setup for use in the kerberos distribution. | ||
| 35 | |||
| 36 | These routines are best compiled with gcc or any other good | ||
| 37 | optimising compiler. | ||
| 38 | Just turn you optimiser up to the highest settings and run destest | ||
| 39 | after the build to make sure everything works. | ||
| 40 | |||
| 41 | I believe these routines are close to the fastest and most portable DES | ||
| 42 | routines that use small lookup tables (4.5k) that are publicly available. | ||
| 43 | The fcrypt routine is faster than ufc's fcrypt (when compiling with | ||
| 44 | gcc2 -O2) on the sparc 2 (1410 vs 1270) but is not so good on other machines | ||
| 45 | (on a sun3/260 168 vs 336). It is a function of CPU on chip cache size. | ||
| 46 | [ 10-Jan-97 and a function of an incorrect speed testing program in | ||
| 47 | ufc which gave much better test figures that reality ]. | ||
| 48 | |||
| 49 | It is worth noting that on sparc and Alpha CPUs, performance of the DES | ||
| 50 | library can vary by upto %10 due to the positioning of files after application | ||
| 51 | linkage. | ||
| 52 | |||
| 53 | Eric Young (eay@cryptsoft.com) | ||
| 54 | |||
diff --git a/src/lib/libcrypto/des/VERSION b/src/lib/libcrypto/des/VERSION deleted file mode 100644 index c7d01542bc..0000000000 --- a/src/lib/libcrypto/des/VERSION +++ /dev/null | |||
| @@ -1,412 +0,0 @@ | |||
| 1 | Fixed the weak key values which were wrong :-( | ||
| 2 | Defining SIGACTION causes sigaction() to be used instead of signal(). | ||
| 3 | SIGUSR1/SIGUSR2 are no longer mapped in the read tty stuff because it | ||
| 4 | can cause problems. This should hopefully not affect normal | ||
| 5 | applications. | ||
| 6 | |||
| 7 | Version 4.04 | ||
| 8 | Fixed a few tests in destest. Also added x86 assember for | ||
| 9 | des_ncbc_encrypt() which is the standard cbc mode function. | ||
| 10 | This makes a very very large performace difference. | ||
| 11 | Ariel Glenn ariel@columbia.edu reports that the terminal | ||
| 12 | 'turn echo off' can return (errno == EINVAL) under solaris | ||
| 13 | when redirection is used. So I now catch that as well as ENOTTY. | ||
| 14 | |||
| 15 | |||
| 16 | Version 4.03 | ||
| 17 | Left a static out of enc_write.c, which caused to buffer to be | ||
| 18 | continiously malloc()ed. Does anyone use these functions? I keep | ||
| 19 | on feeling like removing them since I only had these in there | ||
| 20 | for a version of kerberised login. Anyway, this was pointed out | ||
| 21 | by Theo de Raadt <deraadt@cvs.openbsd.org> | ||
| 22 | The 'n' bit ofb code was wrong, it was not shifting the shift | ||
| 23 | register. It worked correctly for n == 64. Thanks to | ||
| 24 | Gigi Ankeny <Gigi.Ankeny@Eng.Sun.COM> for pointing this one out. | ||
| 25 | |||
| 26 | Version 4.02 | ||
| 27 | I was doing 'if (memcmp(weak_keys[i],key,sizeof(key)) == 0)' | ||
| 28 | when checking for weak keys which is wrong :-(, pointed out by | ||
| 29 | Markus F.X.J. Oberhumer <markus.oberhumer@jk.uni-linz.ac.at>. | ||
| 30 | |||
| 31 | Version 4.01 | ||
| 32 | Even faster inner loop in the DES assembler for x86 and a modification | ||
| 33 | for IP/FP which is faster on x86. Both of these changes are | ||
| 34 | from Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>. His | ||
| 35 | changes make the assembler run %40 faster on a pentium. This is just | ||
| 36 | a case of getting the instruction sequence 'just right'. | ||
| 37 | All credit to 'Svend' :-) | ||
| 38 | Quite a few special x86 'make' targets. | ||
| 39 | A libdes-l (lite) distribution. | ||
| 40 | |||
| 41 | Version 4.00 | ||
| 42 | After a bit of a pause, I'll up the major version number since this | ||
| 43 | is mostly a performace release. I've added x86 assembler and | ||
| 44 | added more options for performance. A %28 speedup for gcc | ||
| 45 | on a pentium and the assembler is a %50 speedup. | ||
| 46 | MIPS CPU's, sparc and Alpha are the main CPU's with speedups. | ||
| 47 | Run des_opts to work out which options should be used. | ||
| 48 | DES_RISC1/DES_RISC2 use alternative inner loops which use | ||
| 49 | more registers but should give speedups on any CPU that does | ||
| 50 | dual issue (pentium). DES_UNROLL unrolls the inner loop, | ||
| 51 | which costs in code size. | ||
| 52 | |||
| 53 | Version 3.26 | ||
| 54 | I've finally removed one of the shifts in D_ENCRYPT. This | ||
| 55 | meant I've changed the des_SPtrans table (spr.h), the set_key() | ||
| 56 | function and some things in des_enc.c. This has definitly | ||
| 57 | made things faster :-). I've known about this one for some | ||
| 58 | time but I've been too lazy to follow it up :-). | ||
| 59 | Noticed that in the D_ENCRYPT() macro, we can just do L^=(..)^(..)^.. | ||
| 60 | instead of L^=((..)|(..)|(..).. This should save a register at | ||
| 61 | least. | ||
| 62 | Assember for x86. The file to replace is des_enc.c, which is replaced | ||
| 63 | by one of the assembler files found in asm. Look at des/asm/readme | ||
| 64 | for more info. | ||
| 65 | |||
| 66 | /* Modification to fcrypt so it can be compiled to support | ||
| 67 | HPUX 10.x's long password format, define -DLONGCRYPT to use this. | ||
| 68 | Thanks to Jens Kupferschmidt <bt1cu@hpboot.rz.uni-leipzig.de>. */ | ||
| 69 | |||
| 70 | SIGWINCH case put in des_read_passwd() so the function does not | ||
| 71 | 'exit' if this function is recieved. | ||
| 72 | |||
| 73 | Version 3.25 17/07/96 | ||
| 74 | Modified read_pwd.c so that stdin can be read if not a tty. | ||
| 75 | Thanks to Jeff Barber <jeffb@issl.atl.hp.com> for the patches. | ||
| 76 | des_init_random_number_generator() shortened due to VMS linker | ||
| 77 | limits. | ||
| 78 | Added RSA's DESX cbc mode. It is a form of cbc encryption, with 2 | ||
| 79 | 8 byte quantites xored before and after encryption. | ||
| 80 | des_xcbc_encryption() - the name is funny to preserve the des_ | ||
| 81 | prefix on all functions. | ||
| 82 | |||
| 83 | Version 3.24 20/04/96 | ||
| 84 | The DES_PTR macro option checked and used by SSLeay configuration | ||
| 85 | |||
| 86 | Version 3.23 11/04/96 | ||
| 87 | Added DES_LONG. If defined to 'unsigned int' on the DEC Alpha, | ||
| 88 | it gives a %20 speedup :-) | ||
| 89 | Fixed the problem with des.pl under perl5. The patches were | ||
| 90 | sent by Ed Kubaitis (ejk@uiuc.edu). | ||
| 91 | if fcrypt.c, changed values to handle illegal salt values the way | ||
| 92 | normal crypt() implementations do. Some programs apparently use | ||
| 93 | them :-(. The patch was sent by Bjorn Gronvall <bg@sics.se> | ||
| 94 | |||
| 95 | Version 3.22 29/11/95 | ||
| 96 | Bug in des(1), an error with the uuencoding stuff when the | ||
| 97 | 'data' is small, thanks to Geoff Keating <keagchon@mehta.anu.edu.au> | ||
| 98 | for the patch. | ||
| 99 | |||
| 100 | Version 3.21 22/11/95 | ||
| 101 | After some emailing back and forth with | ||
| 102 | Colin Plumb <colin@nyx10.cs.du.edu>, I've tweaked a few things | ||
| 103 | and in a future version I will probably put in some of the | ||
| 104 | optimisation he suggested for use with the DES_USE_PTR option. | ||
| 105 | Extra routines from Mark Murray <mark@grondar.za> for use in | ||
| 106 | freeBSD. They mostly involve random number generation for use | ||
| 107 | with kerberos. They involve evil machine specific system calls | ||
| 108 | etc so I would normally suggest pushing this stuff into the | ||
| 109 | application and/or using RAND_seed()/RAND_bytes() if you are | ||
| 110 | using this DES library as part of SSLeay. | ||
| 111 | Redone the read_pw() function so that it is cleaner and | ||
| 112 | supports termios, thanks to Sameer Parekh <sameer@c2.org> | ||
| 113 | for the initial patches for this. | ||
| 114 | Renamed 3ecb_encrypt() to ecb3_encrypt(). This has been | ||
| 115 | done just to make things more consistent. | ||
| 116 | I have also now added triple DES versions of cfb and ofb. | ||
| 117 | |||
| 118 | Version 3.20 | ||
| 119 | Damn, Damn, Damn, as pointed out by Mike_Spreitzer.PARC@xerox.com, | ||
| 120 | my des_random_seed() function was only copying 4 bytes of the | ||
| 121 | passed seed into the init structure. It is now fixed to copy 8. | ||
| 122 | My own suggestion is to used something like MD5 :-) | ||
| 123 | |||
| 124 | Version 3.19 | ||
| 125 | While looking at my code one day, I though, why do I keep on | ||
| 126 | calling des_encrypt(in,out,ks,enc) when every function that | ||
| 127 | calls it has in and out the same. So I dropped the 'out' | ||
| 128 | parameter, people should not be using this function. | ||
| 129 | |||
| 130 | Version 3.18 30/08/95 | ||
| 131 | Fixed a few bit with the distribution and the filenames. | ||
| 132 | 3.17 had been munged via a move to DOS and back again. | ||
| 133 | NO CODE CHANGES | ||
| 134 | |||
| 135 | Version 3.17 14/07/95 | ||
| 136 | Fixed ede3 cbc which I had broken in 3.16. I have also | ||
| 137 | removed some unneeded variables in 7-8 of the routines. | ||
| 138 | |||
| 139 | Version 3.16 26/06/95 | ||
| 140 | Added des_encrypt2() which does not use IP/FP, used by triple | ||
| 141 | des routines. Tweaked things a bit elsewhere. %13 speedup on | ||
| 142 | sparc and %6 on a R4400 for ede3 cbc mode. | ||
| 143 | |||
| 144 | Version 3.15 06/06/95 | ||
| 145 | Added des_ncbc_encrypt(), it is des_cbc mode except that it is | ||
| 146 | 'normal' and copies the new iv value back over the top of the | ||
| 147 | passed parameter. | ||
| 148 | CHANGED des_ede3_cbc_encrypt() so that it too now overwrites | ||
| 149 | the iv. THIS WILL BREAK EXISTING CODE, but since this function | ||
| 150 | only new, I feel I can change it, not so with des_cbc_encrypt :-(. | ||
| 151 | I need to update the documentation. | ||
| 152 | |||
| 153 | Version 3.14 31/05/95 | ||
| 154 | New release upon the world, as part of my SSL implementation. | ||
| 155 | New copyright and usage stuff. Basically free for all to use | ||
| 156 | as long as you say it came from me :-) | ||
| 157 | |||
| 158 | Version 3.13 31/05/95 | ||
| 159 | A fix in speed.c, if HZ is not defined, I set it to 100.0 | ||
| 160 | which is reasonable for most unixes except SunOS 4.x. | ||
| 161 | I now have a #ifdef sun but timing for SunOS 4.x looked very | ||
| 162 | good :-(. At my last job where I used SunOS 4.x, it was | ||
| 163 | defined to be 60.0 (look at the old INSTALL documentation), at | ||
| 164 | the last release had it changed to 100.0 since I now work with | ||
| 165 | Solaris2 and SVR4 boxes. | ||
| 166 | Thanks to Rory Chisholm <rchishol@math.ethz.ch> for pointing this | ||
| 167 | one out. | ||
| 168 | |||
| 169 | Version 3.12 08/05/95 | ||
| 170 | As pointed out by The Crypt Keeper <tck@bend.UCSD.EDU>, | ||
| 171 | my D_ENCRYPT macro in crypt() had an un-necessary variable. | ||
| 172 | It has been removed. | ||
| 173 | |||
| 174 | Version 3.11 03/05/95 | ||
| 175 | Added des_ede3_cbc_encrypt() which is cbc mode des with 3 keys | ||
| 176 | and one iv. It is a standard and I needed it for my SSL code. | ||
| 177 | It makes more sense to use this for triple DES than | ||
| 178 | 3cbc_encrypt(). I have also added (or should I say tested :-) | ||
| 179 | cfb64_encrypt() which is cfb64 but it will encrypt a partial | ||
| 180 | number of bytes - 3 bytes in 3 bytes out. Again this is for | ||
| 181 | my SSL library, as a form of encryption to use with SSL | ||
| 182 | telnet. | ||
| 183 | |||
| 184 | Version 3.10 22/03/95 | ||
| 185 | Fixed a bug in 3cbc_encrypt() :-(. When making repeated calls | ||
| 186 | to cbc3_encrypt, the 2 iv values that were being returned to | ||
| 187 | be used in the next call were reversed :-(. | ||
| 188 | Many thanks to Bill Wade <wade@Stoner.COM> for pointing out | ||
| 189 | this error. | ||
| 190 | |||
| 191 | Version 3.09 01/02/95 | ||
| 192 | Fixed des_random_key to far more random, it was rather feeble | ||
| 193 | with regards to picking the initial seed. The problem was | ||
| 194 | pointed out by Olaf Kirch <okir@monad.swb.de>. | ||
| 195 | |||
| 196 | Version 3.08 14/12/94 | ||
| 197 | Added Makefile.PL so libdes can be built into perl5. | ||
| 198 | Changed des_locl.h so RAND is always defined. | ||
| 199 | |||
| 200 | Version 3.07 05/12/94 | ||
| 201 | Added GNUmake and stuff so the library can be build with | ||
| 202 | glibc. | ||
| 203 | |||
| 204 | Version 3.06 30/08/94 | ||
| 205 | Added rpc_enc.c which contains _des_crypt. This is for use in | ||
| 206 | secure_rpc v 4.0 | ||
| 207 | Finally fixed the cfb_enc problems. | ||
| 208 | Fixed a few parameter parsing bugs in des (-3 and -b), thanks | ||
| 209 | to Rob McMillan <R.McMillan@its.gu.edu.au> | ||
| 210 | |||
| 211 | Version 3.05 21/04/94 | ||
| 212 | for unsigned long l; gcc does not produce ((l>>34) == 0) | ||
| 213 | This causes bugs in cfb_enc. | ||
| 214 | Thanks to Hadmut Danisch <danisch@ira.uka.de> | ||
| 215 | |||
| 216 | Version 3.04 20/04/94 | ||
| 217 | Added a version number to des.c and libdes.a | ||
| 218 | |||
| 219 | Version 3.03 12/01/94 | ||
| 220 | Fixed a bug in non zero iv in 3cbc_enc. | ||
| 221 | |||
| 222 | Version 3.02 29/10/93 | ||
| 223 | I now work in a place where there are 6+ architectures and 14+ | ||
| 224 | OS versions :-). | ||
| 225 | Fixed TERMIO definition so the most sys V boxes will work :-) | ||
| 226 | |||
| 227 | Release upon comp.sources.misc | ||
| 228 | Version 3.01 08/10/93 | ||
| 229 | Added des_3cbc_encrypt() | ||
| 230 | |||
| 231 | Version 3.00 07/10/93 | ||
| 232 | Fixed up documentation. | ||
| 233 | quad_cksum definitely compatible with MIT's now. | ||
| 234 | |||
| 235 | Version 2.30 24/08/93 | ||
| 236 | Triple DES now defaults to triple cbc but can do triple ecb | ||
| 237 | with the -b flag. | ||
| 238 | Fixed some MSDOS uuen/uudecoding problems, thanks to | ||
| 239 | Added prototypes. | ||
| 240 | |||
| 241 | Version 2.22 29/06/93 | ||
| 242 | Fixed a bug in des_is_weak_key() which stopped it working :-( | ||
| 243 | thanks to engineering@MorningStar.Com. | ||
| 244 | |||
| 245 | Version 2.21 03/06/93 | ||
| 246 | des(1) with no arguments gives quite a bit of help. | ||
| 247 | Added -c (generate ckecksum) flag to des(1). | ||
| 248 | Added -3 (triple DES) flag to des(1). | ||
| 249 | Added cfb and ofb routines to the library. | ||
| 250 | |||
| 251 | Version 2.20 11/03/93 | ||
| 252 | Added -u (uuencode) flag to des(1). | ||
| 253 | I have been playing with byte order in quad_cksum to make it | ||
| 254 | compatible with MIT's version. All I can say is avid this | ||
| 255 | function if possible since MIT's output is endian dependent. | ||
| 256 | |||
| 257 | Version 2.12 14/10/92 | ||
| 258 | Added MSDOS specific macro in ecb_encrypt which gives a %70 | ||
| 259 | speed up when the code is compiled with turbo C. | ||
| 260 | |||
| 261 | Version 2.11 12/10/92 | ||
| 262 | Speedup in set_key (recoding of PC-1) | ||
| 263 | I now do it in 47 simple operations, down from 60. | ||
| 264 | Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov) | ||
| 265 | for motivating me to look for a faster system :-) | ||
| 266 | The speedup is probably less that 1% but it is still 13 | ||
| 267 | instructions less :-). | ||
| 268 | |||
| 269 | Version 2.10 06/10/92 | ||
| 270 | The code now works on the 64bit ETA10 and CRAY without modifications or | ||
| 271 | #defines. I believe the code should work on any machine that | ||
| 272 | defines long, int or short to be 8 bytes long. | ||
| 273 | Thanks to Shabbir J. Safdar (shabby@mentor.cc.purdue.edu) | ||
| 274 | for helping me fix the code to run on 64bit machines (he had | ||
| 275 | access to an ETA10). | ||
| 276 | Thanks also to John Fletcher <john_fletcher@lccmail.ocf.llnl.gov> | ||
| 277 | for testing the routines on a CRAY. | ||
| 278 | read_password.c has been renamed to read_passwd.c | ||
| 279 | string_to_key.c has been renamed to string2key.c | ||
| 280 | |||
| 281 | Version 2.00 14/09/92 | ||
| 282 | Made mods so that the library should work on 64bit CPU's. | ||
| 283 | Removed all my uchar and ulong defs. To many different | ||
| 284 | versions of unix define them in their header files in too many | ||
| 285 | different combinations :-) | ||
| 286 | IRIX - Sillicon Graphics mods (mostly in read_password.c). | ||
| 287 | Thanks to Andrew Daviel (advax@erich.triumf.ca) | ||
| 288 | |||
| 289 | Version 1.99 26/08/92 | ||
| 290 | Fixed a bug or 2 in enc_read.c | ||
| 291 | Fixed a bug in enc_write.c | ||
| 292 | Fixed a pseudo bug in fcrypt.c (very obscure). | ||
| 293 | |||
| 294 | Version 1.98 31/07/92 | ||
| 295 | Support for the ETA10. This is a strange machine that defines | ||
| 296 | longs and ints as 8 bytes and shorts as 4 bytes. | ||
| 297 | Since I do evil things with long * that assume that they are 4 | ||
| 298 | bytes. Look in the Makefile for the option to compile for | ||
| 299 | this machine. quad_cksum appears to have problems but I | ||
| 300 | will don't have the time to fix it right now, and this is not | ||
| 301 | a function that uses DES and so will not effect the main uses | ||
| 302 | of the library. | ||
| 303 | |||
| 304 | Version 1.97 20/05/92 eay | ||
| 305 | Fixed the Imakefile and made some changes to des.h to fix some | ||
| 306 | problems when building this package with Kerberos v 4. | ||
| 307 | |||
| 308 | Version 1.96 18/05/92 eay | ||
| 309 | Fixed a small bug in string_to_key() where problems could | ||
| 310 | occur if des_check_key was set to true and the string | ||
| 311 | generated a weak key. | ||
| 312 | |||
| 313 | Patch2 posted to comp.sources.misc | ||
| 314 | Version 1.95 13/05/92 eay | ||
| 315 | Added an alternative version of the D_ENCRYPT macro in | ||
| 316 | ecb_encrypt and fcrypt. Depending on the compiler, one version or the | ||
| 317 | other will be faster. This was inspired by | ||
| 318 | Dana How <how@isl.stanford.edu>, and her pointers about doing the | ||
| 319 | *(ulong *)((uchar *)ptr+(value&0xfc)) | ||
| 320 | vs | ||
| 321 | ptr[value&0x3f] | ||
| 322 | to stop the C compiler doing a <<2 to convert the long array index. | ||
| 323 | |||
| 324 | Version 1.94 05/05/92 eay | ||
| 325 | Fixed an incompatibility between my string_to_key and the MIT | ||
| 326 | version. When the key is longer than 8 chars, I was wrapping | ||
| 327 | with a different method. To use the old version, define | ||
| 328 | OLD_STR_TO_KEY in the makefile. Thanks to | ||
| 329 | viktor@newsu.shearson.com (Viktor Dukhovni). | ||
| 330 | |||
| 331 | Version 1.93 28/04/92 eay | ||
| 332 | Fixed the VMS mods so that echo is now turned off in | ||
| 333 | read_password. Thanks again to brennan@coco.cchs.su.oz.AU. | ||
| 334 | MSDOS support added. The routines can be compiled with | ||
| 335 | Turbo C (v2.0) and MSC (v5.1). Make sure MSDOS is defined. | ||
| 336 | |||
| 337 | Patch1 posted to comp.sources.misc | ||
| 338 | Version 1.92 13/04/92 eay | ||
| 339 | Changed D_ENCRYPT so that the rotation of R occurs outside of | ||
| 340 | the loop. This required rotating all the longs in sp.h (now | ||
| 341 | called spr.h). Thanks to Richard Outerbridge <71755.204@CompuServe.COM> | ||
| 342 | speed.c has been changed so it will work without SIGALRM. If | ||
| 343 | times(3) is not present it will try to use ftime() instead. | ||
| 344 | |||
| 345 | Version 1.91 08/04/92 eay | ||
| 346 | Added -E/-D options to des(1) so it can use string_to_key. | ||
| 347 | Added SVR4 mods suggested by witr@rwwa.COM | ||
| 348 | Added VMS mods suggested by brennan@coco.cchs.su.oz.AU. If | ||
| 349 | anyone knows how to turn of tty echo in VMS please tell me or | ||
| 350 | implement it yourself :-). | ||
| 351 | Changed FILE *IN/*OUT to *DES_IN/*DES_OUT since it appears VMS | ||
| 352 | does not like IN/OUT being used. | ||
| 353 | |||
| 354 | Libdes posted to comp.sources.misc | ||
| 355 | Version 1.9 24/03/92 eay | ||
| 356 | Now contains a fast small crypt replacement. | ||
| 357 | Added des(1) command. | ||
| 358 | Added des_rw_mode so people can use cbc encryption with | ||
| 359 | enc_read and enc_write. | ||
| 360 | |||
| 361 | Version 1.8 15/10/91 eay | ||
| 362 | Bug in cbc_cksum. | ||
| 363 | Many thanks to Keith Reynolds (keithr@sco.COM) for pointing this | ||
| 364 | one out. | ||
| 365 | |||
| 366 | Version 1.7 24/09/91 eay | ||
| 367 | Fixed set_key :-) | ||
| 368 | set_key is 4 times faster and takes less space. | ||
| 369 | There are a few minor changes that could be made. | ||
| 370 | |||
| 371 | Version 1.6 19/09/1991 eay | ||
| 372 | Finally go IP and FP finished. | ||
| 373 | Now I need to fix set_key. | ||
| 374 | This version is quite a bit faster that 1.51 | ||
| 375 | |||
| 376 | Version 1.52 15/06/1991 eay | ||
| 377 | 20% speedup in ecb_encrypt by changing the E bit selection | ||
| 378 | to use 2 32bit words. This also required modification of the | ||
| 379 | sp table. There is still a way to speedup the IP and IP-1 | ||
| 380 | (hints from outer@sq.com) still working on this one :-(. | ||
| 381 | |||
| 382 | Version 1.51 07/06/1991 eay | ||
| 383 | Faster des_encrypt by loop unrolling | ||
| 384 | Fixed bug in quad_cksum.c (thanks to hughes@logos.ucs.indiana.edu) | ||
| 385 | |||
| 386 | Version 1.50 28/05/1991 eay | ||
| 387 | Optimised the code a bit more for the sparc. I have improved the | ||
| 388 | speed of the inner des_encrypt by speeding up the initial and | ||
| 389 | final permutations. | ||
| 390 | |||
| 391 | Version 1.40 23/10/1990 eay | ||
| 392 | Fixed des_random_key, it did not produce a random key :-( | ||
| 393 | |||
| 394 | Version 1.30 2/10/1990 eay | ||
| 395 | Have made des_quad_cksum the same as MIT's, the full package | ||
| 396 | should be compatible with MIT's | ||
| 397 | Have tested on a DECstation 3100 | ||
| 398 | Still need to fix des_set_key (make it faster). | ||
| 399 | Does des_cbc_encrypts at 70.5k/sec on a 3100. | ||
| 400 | |||
| 401 | Version 1.20 18/09/1990 eay | ||
| 402 | Fixed byte order dependencies. | ||
| 403 | Fixed (I hope) all the word alignment problems. | ||
| 404 | Speedup in des_ecb_encrypt. | ||
| 405 | |||
| 406 | Version 1.10 11/09/1990 eay | ||
| 407 | Added des_enc_read and des_enc_write. | ||
| 408 | Still need to fix des_quad_cksum. | ||
| 409 | Still need to document des_enc_read and des_enc_write. | ||
| 410 | |||
| 411 | Version 1.00 27/08/1990 eay | ||
| 412 | |||
diff --git a/src/lib/libcrypto/des/des_opts.c b/src/lib/libcrypto/des/des_opts.c deleted file mode 100644 index c713c5e319..0000000000 --- a/src/lib/libcrypto/des/des_opts.c +++ /dev/null | |||
| @@ -1,608 +0,0 @@ | |||
| 1 | /* crypto/des/des_opts.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* define PART1, PART2, PART3 or PART4 to build only with a few of the options. | ||
| 60 | * This is for machines with 64k code segment size restrictions. */ | ||
| 61 | |||
| 62 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 63 | #define TIMES | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #include <stdio.h> | ||
| 67 | #ifndef OPENSSL_SYS_MSDOS | ||
| 68 | #include <openssl/e_os2.h> | ||
| 69 | #include <unistd.h> | ||
| 70 | #else | ||
| 71 | #include <io.h> | ||
| 72 | extern void exit(); | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #ifndef OPENSSL_SYS_NETWARE | ||
| 76 | #include <signal.h> | ||
| 77 | #endif | ||
| 78 | |||
| 79 | #ifndef _IRIX | ||
| 80 | #include <time.h> | ||
| 81 | #endif | ||
| 82 | #ifdef TIMES | ||
| 83 | #include <sys/types.h> | ||
| 84 | #include <sys/times.h> | ||
| 85 | #endif | ||
| 86 | |||
| 87 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 88 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 89 | undefine TIMES, since that tells the rest of the program how things | ||
| 90 | should be handled. -- Richard Levitte */ | ||
| 91 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 92 | #undef TIMES | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef TIMES | ||
| 96 | #include <sys/timeb.h> | ||
| 97 | #endif | ||
| 98 | |||
| 99 | |||
| 100 | #if defined(sun) || defined(__ultrix) | ||
| 101 | #define _POSIX_SOURCE | ||
| 102 | #include <limits.h> | ||
| 103 | #include <sys/param.h> | ||
| 104 | #endif | ||
| 105 | |||
| 106 | #include <openssl/des.h> | ||
| 107 | #include "spr.h" | ||
| 108 | |||
| 109 | #define DES_DEFAULT_OPTIONS | ||
| 110 | |||
| 111 | #if !defined(PART1) && !defined(PART2) && !defined(PART3) && !defined(PART4) | ||
| 112 | #define PART1 | ||
| 113 | #define PART2 | ||
| 114 | #define PART3 | ||
| 115 | #define PART4 | ||
| 116 | #endif | ||
| 117 | |||
| 118 | #ifdef PART1 | ||
| 119 | |||
| 120 | #undef DES_UNROLL | ||
| 121 | #undef DES_RISC1 | ||
| 122 | #undef DES_RISC2 | ||
| 123 | #undef DES_PTR | ||
| 124 | #undef D_ENCRYPT | ||
| 125 | #define DES_encrypt1 des_encrypt_u4_cisc_idx | ||
| 126 | #define DES_encrypt2 des_encrypt2_u4_cisc_idx | ||
| 127 | #define DES_encrypt3 des_encrypt3_u4_cisc_idx | ||
| 128 | #define DES_decrypt3 des_decrypt3_u4_cisc_idx | ||
| 129 | #undef HEADER_DES_LOCL_H | ||
| 130 | #include "des_enc.c" | ||
| 131 | |||
| 132 | #define DES_UNROLL | ||
| 133 | #undef DES_RISC1 | ||
| 134 | #undef DES_RISC2 | ||
| 135 | #undef DES_PTR | ||
| 136 | #undef D_ENCRYPT | ||
| 137 | #undef DES_encrypt1 | ||
| 138 | #undef DES_encrypt2 | ||
| 139 | #undef DES_encrypt3 | ||
| 140 | #undef DES_decrypt3 | ||
| 141 | #define DES_encrypt1 des_encrypt_u16_cisc_idx | ||
| 142 | #define DES_encrypt2 des_encrypt2_u16_cisc_idx | ||
| 143 | #define DES_encrypt3 des_encrypt3_u16_cisc_idx | ||
| 144 | #define DES_decrypt3 des_decrypt3_u16_cisc_idx | ||
| 145 | #undef HEADER_DES_LOCL_H | ||
| 146 | #include "des_enc.c" | ||
| 147 | |||
| 148 | #undef DES_UNROLL | ||
| 149 | #define DES_RISC1 | ||
| 150 | #undef DES_RISC2 | ||
| 151 | #undef DES_PTR | ||
| 152 | #undef D_ENCRYPT | ||
| 153 | #undef DES_encrypt1 | ||
| 154 | #undef DES_encrypt2 | ||
| 155 | #undef DES_encrypt3 | ||
| 156 | #undef DES_decrypt3 | ||
| 157 | #define DES_encrypt1 des_encrypt_u4_risc1_idx | ||
| 158 | #define DES_encrypt2 des_encrypt2_u4_risc1_idx | ||
| 159 | #define DES_encrypt3 des_encrypt3_u4_risc1_idx | ||
| 160 | #define DES_decrypt3 des_decrypt3_u4_risc1_idx | ||
| 161 | #undef HEADER_DES_LOCL_H | ||
| 162 | #include "des_enc.c" | ||
| 163 | |||
| 164 | #endif | ||
| 165 | |||
| 166 | #ifdef PART2 | ||
| 167 | |||
| 168 | #undef DES_UNROLL | ||
| 169 | #undef DES_RISC1 | ||
| 170 | #define DES_RISC2 | ||
| 171 | #undef DES_PTR | ||
| 172 | #undef D_ENCRYPT | ||
| 173 | #undef DES_encrypt1 | ||
| 174 | #undef DES_encrypt2 | ||
| 175 | #undef DES_encrypt3 | ||
| 176 | #undef DES_decrypt3 | ||
| 177 | #define DES_encrypt1 des_encrypt_u4_risc2_idx | ||
| 178 | #define DES_encrypt2 des_encrypt2_u4_risc2_idx | ||
| 179 | #define DES_encrypt3 des_encrypt3_u4_risc2_idx | ||
| 180 | #define DES_decrypt3 des_decrypt3_u4_risc2_idx | ||
| 181 | #undef HEADER_DES_LOCL_H | ||
| 182 | #include "des_enc.c" | ||
| 183 | |||
| 184 | #define DES_UNROLL | ||
| 185 | #define DES_RISC1 | ||
| 186 | #undef DES_RISC2 | ||
| 187 | #undef DES_PTR | ||
| 188 | #undef D_ENCRYPT | ||
| 189 | #undef DES_encrypt1 | ||
| 190 | #undef DES_encrypt2 | ||
| 191 | #undef DES_encrypt3 | ||
| 192 | #undef DES_decrypt3 | ||
| 193 | #define DES_encrypt1 des_encrypt_u16_risc1_idx | ||
| 194 | #define DES_encrypt2 des_encrypt2_u16_risc1_idx | ||
| 195 | #define DES_encrypt3 des_encrypt3_u16_risc1_idx | ||
| 196 | #define DES_decrypt3 des_decrypt3_u16_risc1_idx | ||
| 197 | #undef HEADER_DES_LOCL_H | ||
| 198 | #include "des_enc.c" | ||
| 199 | |||
| 200 | #define DES_UNROLL | ||
| 201 | #undef DES_RISC1 | ||
| 202 | #define DES_RISC2 | ||
| 203 | #undef DES_PTR | ||
| 204 | #undef D_ENCRYPT | ||
| 205 | #undef DES_encrypt1 | ||
| 206 | #undef DES_encrypt2 | ||
| 207 | #undef DES_encrypt3 | ||
| 208 | #undef DES_decrypt3 | ||
| 209 | #define DES_encrypt1 des_encrypt_u16_risc2_idx | ||
| 210 | #define DES_encrypt2 des_encrypt2_u16_risc2_idx | ||
| 211 | #define DES_encrypt3 des_encrypt3_u16_risc2_idx | ||
| 212 | #define DES_decrypt3 des_decrypt3_u16_risc2_idx | ||
| 213 | #undef HEADER_DES_LOCL_H | ||
| 214 | #include "des_enc.c" | ||
| 215 | |||
| 216 | #endif | ||
| 217 | |||
| 218 | #ifdef PART3 | ||
| 219 | |||
| 220 | #undef DES_UNROLL | ||
| 221 | #undef DES_RISC1 | ||
| 222 | #undef DES_RISC2 | ||
| 223 | #define DES_PTR | ||
| 224 | #undef D_ENCRYPT | ||
| 225 | #undef DES_encrypt1 | ||
| 226 | #undef DES_encrypt2 | ||
| 227 | #undef DES_encrypt3 | ||
| 228 | #undef DES_decrypt3 | ||
| 229 | #define DES_encrypt1 des_encrypt_u4_cisc_ptr | ||
| 230 | #define DES_encrypt2 des_encrypt2_u4_cisc_ptr | ||
| 231 | #define DES_encrypt3 des_encrypt3_u4_cisc_ptr | ||
| 232 | #define DES_decrypt3 des_decrypt3_u4_cisc_ptr | ||
| 233 | #undef HEADER_DES_LOCL_H | ||
| 234 | #include "des_enc.c" | ||
| 235 | |||
| 236 | #define DES_UNROLL | ||
| 237 | #undef DES_RISC1 | ||
| 238 | #undef DES_RISC2 | ||
| 239 | #define DES_PTR | ||
| 240 | #undef D_ENCRYPT | ||
| 241 | #undef DES_encrypt1 | ||
| 242 | #undef DES_encrypt2 | ||
| 243 | #undef DES_encrypt3 | ||
| 244 | #undef DES_decrypt3 | ||
| 245 | #define DES_encrypt1 des_encrypt_u16_cisc_ptr | ||
| 246 | #define DES_encrypt2 des_encrypt2_u16_cisc_ptr | ||
| 247 | #define DES_encrypt3 des_encrypt3_u16_cisc_ptr | ||
| 248 | #define DES_decrypt3 des_decrypt3_u16_cisc_ptr | ||
| 249 | #undef HEADER_DES_LOCL_H | ||
| 250 | #include "des_enc.c" | ||
| 251 | |||
| 252 | #undef DES_UNROLL | ||
| 253 | #define DES_RISC1 | ||
| 254 | #undef DES_RISC2 | ||
| 255 | #define DES_PTR | ||
| 256 | #undef D_ENCRYPT | ||
| 257 | #undef DES_encrypt1 | ||
| 258 | #undef DES_encrypt2 | ||
| 259 | #undef DES_encrypt3 | ||
| 260 | #undef DES_decrypt3 | ||
| 261 | #define DES_encrypt1 des_encrypt_u4_risc1_ptr | ||
| 262 | #define DES_encrypt2 des_encrypt2_u4_risc1_ptr | ||
| 263 | #define DES_encrypt3 des_encrypt3_u4_risc1_ptr | ||
| 264 | #define DES_decrypt3 des_decrypt3_u4_risc1_ptr | ||
| 265 | #undef HEADER_DES_LOCL_H | ||
| 266 | #include "des_enc.c" | ||
| 267 | |||
| 268 | #endif | ||
| 269 | |||
| 270 | #ifdef PART4 | ||
| 271 | |||
| 272 | #undef DES_UNROLL | ||
| 273 | #undef DES_RISC1 | ||
| 274 | #define DES_RISC2 | ||
| 275 | #define DES_PTR | ||
| 276 | #undef D_ENCRYPT | ||
| 277 | #undef DES_encrypt1 | ||
| 278 | #undef DES_encrypt2 | ||
| 279 | #undef DES_encrypt3 | ||
| 280 | #undef DES_decrypt3 | ||
| 281 | #define DES_encrypt1 des_encrypt_u4_risc2_ptr | ||
| 282 | #define DES_encrypt2 des_encrypt2_u4_risc2_ptr | ||
| 283 | #define DES_encrypt3 des_encrypt3_u4_risc2_ptr | ||
| 284 | #define DES_decrypt3 des_decrypt3_u4_risc2_ptr | ||
| 285 | #undef HEADER_DES_LOCL_H | ||
| 286 | #include "des_enc.c" | ||
| 287 | |||
| 288 | #define DES_UNROLL | ||
| 289 | #define DES_RISC1 | ||
| 290 | #undef DES_RISC2 | ||
| 291 | #define DES_PTR | ||
| 292 | #undef D_ENCRYPT | ||
| 293 | #undef DES_encrypt1 | ||
| 294 | #undef DES_encrypt2 | ||
| 295 | #undef DES_encrypt3 | ||
| 296 | #undef DES_decrypt3 | ||
| 297 | #define DES_encrypt1 des_encrypt_u16_risc1_ptr | ||
| 298 | #define DES_encrypt2 des_encrypt2_u16_risc1_ptr | ||
| 299 | #define DES_encrypt3 des_encrypt3_u16_risc1_ptr | ||
| 300 | #define DES_decrypt3 des_decrypt3_u16_risc1_ptr | ||
| 301 | #undef HEADER_DES_LOCL_H | ||
| 302 | #include "des_enc.c" | ||
| 303 | |||
| 304 | #define DES_UNROLL | ||
| 305 | #undef DES_RISC1 | ||
| 306 | #define DES_RISC2 | ||
| 307 | #define DES_PTR | ||
| 308 | #undef D_ENCRYPT | ||
| 309 | #undef DES_encrypt1 | ||
| 310 | #undef DES_encrypt2 | ||
| 311 | #undef DES_encrypt3 | ||
| 312 | #undef DES_decrypt3 | ||
| 313 | #define DES_encrypt1 des_encrypt_u16_risc2_ptr | ||
| 314 | #define DES_encrypt2 des_encrypt2_u16_risc2_ptr | ||
| 315 | #define DES_encrypt3 des_encrypt3_u16_risc2_ptr | ||
| 316 | #define DES_decrypt3 des_decrypt3_u16_risc2_ptr | ||
| 317 | #undef HEADER_DES_LOCL_H | ||
| 318 | #include "des_enc.c" | ||
| 319 | |||
| 320 | #endif | ||
| 321 | |||
| 322 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 323 | #ifndef HZ | ||
| 324 | # ifndef CLK_TCK | ||
| 325 | # ifndef _BSD_CLK_TCK_ /* FreeBSD fix */ | ||
| 326 | # define HZ 100.0 | ||
| 327 | # else /* _BSD_CLK_TCK_ */ | ||
| 328 | # define HZ ((double)_BSD_CLK_TCK_) | ||
| 329 | # endif | ||
| 330 | # else /* CLK_TCK */ | ||
| 331 | # define HZ ((double)CLK_TCK) | ||
| 332 | # endif | ||
| 333 | #endif | ||
| 334 | |||
| 335 | #define BUFSIZE ((long)1024) | ||
| 336 | long run=0; | ||
| 337 | |||
| 338 | double Time_F(int s); | ||
| 339 | #ifdef SIGALRM | ||
| 340 | #if defined(__STDC__) || defined(sgi) | ||
| 341 | #define SIGRETTYPE void | ||
| 342 | #else | ||
| 343 | #define SIGRETTYPE int | ||
| 344 | #endif | ||
| 345 | |||
| 346 | SIGRETTYPE sig_done(int sig); | ||
| 347 | SIGRETTYPE sig_done(int sig) | ||
| 348 | { | ||
| 349 | signal(SIGALRM,sig_done); | ||
| 350 | run=0; | ||
| 351 | #ifdef LINT | ||
| 352 | sig=sig; | ||
| 353 | #endif | ||
| 354 | } | ||
| 355 | #endif | ||
| 356 | |||
| 357 | #define START 0 | ||
| 358 | #define STOP 1 | ||
| 359 | |||
| 360 | double Time_F(int s) | ||
| 361 | { | ||
| 362 | double ret; | ||
| 363 | #ifdef TIMES | ||
| 364 | static struct tms tstart,tend; | ||
| 365 | |||
| 366 | if (s == START) | ||
| 367 | { | ||
| 368 | times(&tstart); | ||
| 369 | return(0); | ||
| 370 | } | ||
| 371 | else | ||
| 372 | { | ||
| 373 | times(&tend); | ||
| 374 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 375 | return((ret == 0.0)?1e-6:ret); | ||
| 376 | } | ||
| 377 | #else /* !times() */ | ||
| 378 | static struct timeb tstart,tend; | ||
| 379 | long i; | ||
| 380 | |||
| 381 | if (s == START) | ||
| 382 | { | ||
| 383 | ftime(&tstart); | ||
| 384 | return(0); | ||
| 385 | } | ||
| 386 | else | ||
| 387 | { | ||
| 388 | ftime(&tend); | ||
| 389 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 390 | ret=((double)(tend.time-tstart.time))+((double)i)/1000.0; | ||
| 391 | return((ret == 0.0)?1e-6:ret); | ||
| 392 | } | ||
| 393 | #endif | ||
| 394 | } | ||
| 395 | |||
| 396 | #ifdef SIGALRM | ||
| 397 | #define print_name(name) fprintf(stderr,"Doing %s's for 10 seconds\n",name); alarm(10); | ||
| 398 | #else | ||
| 399 | #define print_name(name) fprintf(stderr,"Doing %s %ld times\n",name,cb); | ||
| 400 | #endif | ||
| 401 | |||
| 402 | #define time_it(func,name,index) \ | ||
| 403 | print_name(name); \ | ||
| 404 | Time_F(START); \ | ||
| 405 | for (count=0,run=1; COND(cb); count++) \ | ||
| 406 | { \ | ||
| 407 | unsigned long d[2]; \ | ||
| 408 | func(d,&sch,DES_ENCRYPT); \ | ||
| 409 | } \ | ||
| 410 | tm[index]=Time_F(STOP); \ | ||
| 411 | fprintf(stderr,"%ld %s's in %.2f second\n",count,name,tm[index]); \ | ||
| 412 | tm[index]=((double)COUNT(cb))/tm[index]; | ||
| 413 | |||
| 414 | #define print_it(name,index) \ | ||
| 415 | fprintf(stderr,"%s bytes per sec = %12.2f (%5.1fuS)\n",name, \ | ||
| 416 | tm[index]*8,1.0e6/tm[index]); | ||
| 417 | |||
| 418 | int main(int argc, char **argv) | ||
| 419 | { | ||
| 420 | long count; | ||
| 421 | static unsigned char buf[BUFSIZE]; | ||
| 422 | static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; | ||
| 423 | static DES_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12}; | ||
| 424 | static DES_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34}; | ||
| 425 | DES_key_schedule sch,sch2,sch3; | ||
| 426 | double d,tm[16],max=0; | ||
| 427 | int rank[16]; | ||
| 428 | char *str[16]; | ||
| 429 | int max_idx=0,i,num=0,j; | ||
| 430 | #ifndef SIGALARM | ||
| 431 | long ca,cb,cc,cd,ce; | ||
| 432 | #endif | ||
| 433 | |||
| 434 | for (i=0; i<12; i++) | ||
| 435 | { | ||
| 436 | tm[i]=0.0; | ||
| 437 | rank[i]=0; | ||
| 438 | } | ||
| 439 | |||
| 440 | #ifndef TIMES | ||
| 441 | fprintf(stderr,"To get the most accurate results, try to run this\n"); | ||
| 442 | fprintf(stderr,"program when this computer is idle.\n"); | ||
| 443 | #endif | ||
| 444 | |||
| 445 | DES_set_key_unchecked(&key,&sch); | ||
| 446 | DES_set_key_unchecked(&key2,&sch2); | ||
| 447 | DES_set_key_unchecked(&key3,&sch3); | ||
| 448 | |||
| 449 | #ifndef SIGALRM | ||
| 450 | fprintf(stderr,"First we calculate the approximate speed ...\n"); | ||
| 451 | DES_set_key_unchecked(&key,sch); | ||
| 452 | count=10; | ||
| 453 | do { | ||
| 454 | long i; | ||
| 455 | unsigned long data[2]; | ||
| 456 | |||
| 457 | count*=2; | ||
| 458 | Time_F(START); | ||
| 459 | for (i=count; i; i--) | ||
| 460 | DES_encrypt1(data,&(sch[0]),DES_ENCRYPT); | ||
| 461 | d=Time_F(STOP); | ||
| 462 | } while (d < 3.0); | ||
| 463 | ca=count; | ||
| 464 | cb=count*3; | ||
| 465 | cc=count*3*8/BUFSIZE+1; | ||
| 466 | cd=count*8/BUFSIZE+1; | ||
| 467 | |||
| 468 | ce=count/20+1; | ||
| 469 | #define COND(d) (count != (d)) | ||
| 470 | #define COUNT(d) (d) | ||
| 471 | #else | ||
| 472 | #define COND(c) (run) | ||
| 473 | #define COUNT(d) (count) | ||
| 474 | signal(SIGALRM,sig_done); | ||
| 475 | alarm(10); | ||
| 476 | #endif | ||
| 477 | |||
| 478 | #ifdef PART1 | ||
| 479 | time_it(des_encrypt_u4_cisc_idx, "des_encrypt_u4_cisc_idx ", 0); | ||
| 480 | time_it(des_encrypt_u16_cisc_idx, "des_encrypt_u16_cisc_idx ", 1); | ||
| 481 | time_it(des_encrypt_u4_risc1_idx, "des_encrypt_u4_risc1_idx ", 2); | ||
| 482 | num+=3; | ||
| 483 | #endif | ||
| 484 | #ifdef PART2 | ||
| 485 | time_it(des_encrypt_u16_risc1_idx,"des_encrypt_u16_risc1_idx", 3); | ||
| 486 | time_it(des_encrypt_u4_risc2_idx, "des_encrypt_u4_risc2_idx ", 4); | ||
| 487 | time_it(des_encrypt_u16_risc2_idx,"des_encrypt_u16_risc2_idx", 5); | ||
| 488 | num+=3; | ||
| 489 | #endif | ||
| 490 | #ifdef PART3 | ||
| 491 | time_it(des_encrypt_u4_cisc_ptr, "des_encrypt_u4_cisc_ptr ", 6); | ||
| 492 | time_it(des_encrypt_u16_cisc_ptr, "des_encrypt_u16_cisc_ptr ", 7); | ||
| 493 | time_it(des_encrypt_u4_risc1_ptr, "des_encrypt_u4_risc1_ptr ", 8); | ||
| 494 | num+=3; | ||
| 495 | #endif | ||
| 496 | #ifdef PART4 | ||
| 497 | time_it(des_encrypt_u16_risc1_ptr,"des_encrypt_u16_risc1_ptr", 9); | ||
| 498 | time_it(des_encrypt_u4_risc2_ptr, "des_encrypt_u4_risc2_ptr ",10); | ||
| 499 | time_it(des_encrypt_u16_risc2_ptr,"des_encrypt_u16_risc2_ptr",11); | ||
| 500 | num+=3; | ||
| 501 | #endif | ||
| 502 | |||
| 503 | #ifdef PART1 | ||
| 504 | str[0]=" 4 c i"; | ||
| 505 | print_it("des_encrypt_u4_cisc_idx ",0); | ||
| 506 | max=tm[0]; | ||
| 507 | max_idx=0; | ||
| 508 | str[1]="16 c i"; | ||
| 509 | print_it("des_encrypt_u16_cisc_idx ",1); | ||
| 510 | if (max < tm[1]) { max=tm[1]; max_idx=1; } | ||
| 511 | str[2]=" 4 r1 i"; | ||
| 512 | print_it("des_encrypt_u4_risc1_idx ",2); | ||
| 513 | if (max < tm[2]) { max=tm[2]; max_idx=2; } | ||
| 514 | #endif | ||
| 515 | #ifdef PART2 | ||
| 516 | str[3]="16 r1 i"; | ||
| 517 | print_it("des_encrypt_u16_risc1_idx",3); | ||
| 518 | if (max < tm[3]) { max=tm[3]; max_idx=3; } | ||
| 519 | str[4]=" 4 r2 i"; | ||
| 520 | print_it("des_encrypt_u4_risc2_idx ",4); | ||
| 521 | if (max < tm[4]) { max=tm[4]; max_idx=4; } | ||
| 522 | str[5]="16 r2 i"; | ||
| 523 | print_it("des_encrypt_u16_risc2_idx",5); | ||
| 524 | if (max < tm[5]) { max=tm[5]; max_idx=5; } | ||
| 525 | #endif | ||
| 526 | #ifdef PART3 | ||
| 527 | str[6]=" 4 c p"; | ||
| 528 | print_it("des_encrypt_u4_cisc_ptr ",6); | ||
| 529 | if (max < tm[6]) { max=tm[6]; max_idx=6; } | ||
| 530 | str[7]="16 c p"; | ||
| 531 | print_it("des_encrypt_u16_cisc_ptr ",7); | ||
| 532 | if (max < tm[7]) { max=tm[7]; max_idx=7; } | ||
| 533 | str[8]=" 4 r1 p"; | ||
| 534 | print_it("des_encrypt_u4_risc1_ptr ",8); | ||
| 535 | if (max < tm[8]) { max=tm[8]; max_idx=8; } | ||
| 536 | #endif | ||
| 537 | #ifdef PART4 | ||
| 538 | str[9]="16 r1 p"; | ||
| 539 | print_it("des_encrypt_u16_risc1_ptr",9); | ||
| 540 | if (max < tm[9]) { max=tm[9]; max_idx=9; } | ||
| 541 | str[10]=" 4 r2 p"; | ||
| 542 | print_it("des_encrypt_u4_risc2_ptr ",10); | ||
| 543 | if (max < tm[10]) { max=tm[10]; max_idx=10; } | ||
| 544 | str[11]="16 r2 p"; | ||
| 545 | print_it("des_encrypt_u16_risc2_ptr",11); | ||
| 546 | if (max < tm[11]) { max=tm[11]; max_idx=11; } | ||
| 547 | #endif | ||
| 548 | printf("options des ecb/s\n"); | ||
| 549 | printf("%s %12.2f 100.0%%\n",str[max_idx],tm[max_idx]); | ||
| 550 | d=tm[max_idx]; | ||
| 551 | tm[max_idx]= -2.0; | ||
| 552 | max= -1.0; | ||
| 553 | for (;;) | ||
| 554 | { | ||
| 555 | for (i=0; i<12; i++) | ||
| 556 | { | ||
| 557 | if (max < tm[i]) { max=tm[i]; j=i; } | ||
| 558 | } | ||
| 559 | if (max < 0.0) break; | ||
| 560 | printf("%s %12.2f %4.1f%%\n",str[j],tm[j],tm[j]/d*100.0); | ||
| 561 | tm[j]= -2.0; | ||
| 562 | max= -1.0; | ||
| 563 | } | ||
| 564 | |||
| 565 | switch (max_idx) | ||
| 566 | { | ||
| 567 | case 0: | ||
| 568 | printf("-DDES_DEFAULT_OPTIONS\n"); | ||
| 569 | break; | ||
| 570 | case 1: | ||
| 571 | printf("-DDES_UNROLL\n"); | ||
| 572 | break; | ||
| 573 | case 2: | ||
| 574 | printf("-DDES_RISC1\n"); | ||
| 575 | break; | ||
| 576 | case 3: | ||
| 577 | printf("-DDES_UNROLL -DDES_RISC1\n"); | ||
| 578 | break; | ||
| 579 | case 4: | ||
| 580 | printf("-DDES_RISC2\n"); | ||
| 581 | break; | ||
| 582 | case 5: | ||
| 583 | printf("-DDES_UNROLL -DDES_RISC2\n"); | ||
| 584 | break; | ||
| 585 | case 6: | ||
| 586 | printf("-DDES_PTR\n"); | ||
| 587 | break; | ||
| 588 | case 7: | ||
| 589 | printf("-DDES_UNROLL -DDES_PTR\n"); | ||
| 590 | break; | ||
| 591 | case 8: | ||
| 592 | printf("-DDES_RISC1 -DDES_PTR\n"); | ||
| 593 | break; | ||
| 594 | case 9: | ||
| 595 | printf("-DDES_UNROLL -DDES_RISC1 -DDES_PTR\n"); | ||
| 596 | break; | ||
| 597 | case 10: | ||
| 598 | printf("-DDES_RISC2 -DDES_PTR\n"); | ||
| 599 | break; | ||
| 600 | case 11: | ||
| 601 | printf("-DDES_UNROLL -DDES_RISC2 -DDES_PTR\n"); | ||
| 602 | break; | ||
| 603 | } | ||
| 604 | exit(0); | ||
| 605 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
| 606 | return(0); | ||
| 607 | #endif | ||
| 608 | } | ||
diff --git a/src/lib/libcrypto/des/options.txt b/src/lib/libcrypto/des/options.txt deleted file mode 100644 index 6e2b50f765..0000000000 --- a/src/lib/libcrypto/des/options.txt +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | Note that the UNROLL option makes the 'inner' des loop unroll all 16 rounds | ||
| 2 | instead of the default 4. | ||
| 3 | RISC1 and RISC2 are 2 alternatives for the inner loop and | ||
| 4 | PTR means to use pointers arithmatic instead of arrays. | ||
| 5 | |||
| 6 | FreeBSD - Pentium Pro 200mhz - gcc 2.7.2.2 - assembler 577,000 4620k/s | ||
| 7 | IRIX 6.2 - R10000 195mhz - cc (-O3 -n32) - UNROLL RISC2 PTR 496,000 3968k/s | ||
| 8 | solaris 2.5.1 usparc 167mhz?? - SC4.0 - UNROLL RISC1 PTR [1] 459,400 3672k/s | ||
| 9 | FreeBSD - Pentium Pro 200mhz - gcc 2.7.2.2 - UNROLL RISC1 433,000 3468k/s | ||
| 10 | solaris 2.5.1 usparc 167mhz?? - gcc 2.7.2 - UNROLL 380,000 3041k/s | ||
| 11 | linux - pentium 100mhz - gcc 2.7.0 - assembler 281,000 2250k/s | ||
| 12 | NT 4.0 - pentium 100mhz - VC 4.2 - assembler 281,000 2250k/s | ||
| 13 | AIX 4.1? - PPC604 100mhz - cc - UNROLL 275,000 2200k/s | ||
| 14 | IRIX 5.3 - R4400 200mhz - gcc 2.6.3 - UNROLL RISC2 PTR 235,300 1882k/s | ||
| 15 | IRIX 5.3 - R4400 200mhz - cc - UNROLL RISC2 PTR 233,700 1869k/s | ||
| 16 | NT 4.0 - pentium 100mhz - VC 4.2 - UNROLL RISC1 PTR 191,000 1528k/s | ||
| 17 | DEC Alpha 165mhz?? - cc - RISC2 PTR [2] 181,000 1448k/s | ||
| 18 | linux - pentium 100mhz - gcc 2.7.0 - UNROLL RISC1 PTR 158,500 1268k/s | ||
| 19 | HPUX 10 - 9000/887 - cc - UNROLL [3] 148,000 1190k/s | ||
| 20 | solaris 2.5.1 - sparc 10 50mhz - gcc 2.7.2 - UNROLL 123,600 989k/s | ||
| 21 | IRIX 5.3 - R4000 100mhz - cc - UNROLL RISC2 PTR 101,000 808k/s | ||
| 22 | DGUX - 88100 50mhz(?) - gcc 2.6.3 - UNROLL 81,000 648k/s | ||
| 23 | solaris 2.4 486 50mhz - gcc 2.6.3 - assembler 65,000 522k/s | ||
| 24 | HPUX 10 - 9000/887 - k&r cc (default compiler) - UNROLL PTR 76,000 608k/s | ||
| 25 | solaris 2.4 486 50mhz - gcc 2.6.3 - UNROLL RISC2 43,500 344k/s | ||
| 26 | AIX - old slow one :-) - cc - 39,000 312k/s | ||
| 27 | |||
| 28 | Notes. | ||
| 29 | [1] For the ultra sparc, SunC 4.0 | ||
| 30 | cc -xtarget=ultra -xarch=v8plus -Xa -xO5, running 'des_opts' | ||
| 31 | gives a speed of 344,000 des/s while 'speed' gives 459,000 des/s. | ||
| 32 | I'll record the higher since it is coming from the library but it | ||
| 33 | is all rather weird. | ||
| 34 | [2] Similar to the ultra sparc ([1]), 181,000 for 'des_opts' vs 175,000. | ||
| 35 | [3] I was unable to get access to this machine when it was not heavily loaded. | ||
| 36 | As such, my timing program was never able to get more that %30 of the CPU. | ||
| 37 | This would cause the program to give much lower speed numbers because | ||
| 38 | it would be 'fighting' to stay in the cache with the other CPU burning | ||
| 39 | processes. | ||
diff --git a/src/lib/libcrypto/idea/idea_spd.c b/src/lib/libcrypto/idea/idea_spd.c deleted file mode 100644 index 7905b77926..0000000000 --- a/src/lib/libcrypto/idea/idea_spd.c +++ /dev/null | |||
| @@ -1,298 +0,0 @@ | |||
| 1 | /* crypto/idea/idea_spd.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ | ||
| 60 | /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ | ||
| 61 | |||
| 62 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 63 | #define TIMES | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #include <stdio.h> | ||
| 67 | |||
| 68 | #include <openssl/e_os2.h> | ||
| 69 | #include <unistd.h> | ||
| 70 | |||
| 71 | #ifndef OPENSSL_SYS_NETWARE | ||
| 72 | #include <signal.h> | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #ifndef _IRIX | ||
| 76 | #include <time.h> | ||
| 77 | #endif | ||
| 78 | #ifdef TIMES | ||
| 79 | #include <sys/types.h> | ||
| 80 | #include <sys/times.h> | ||
| 81 | #endif | ||
| 82 | |||
| 83 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 84 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 85 | undefine TIMES, since that tells the rest of the program how things | ||
| 86 | should be handled. -- Richard Levitte */ | ||
| 87 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 88 | #undef TIMES | ||
| 89 | #endif | ||
| 90 | |||
| 91 | #ifndef TIMES | ||
| 92 | #include <sys/timeb.h> | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #if defined(sun) || defined(__ultrix) | ||
| 96 | #define _POSIX_SOURCE | ||
| 97 | #include <limits.h> | ||
| 98 | #include <sys/param.h> | ||
| 99 | #endif | ||
| 100 | |||
| 101 | #include <openssl/idea.h> | ||
| 102 | |||
| 103 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 104 | #ifndef HZ | ||
| 105 | #ifndef CLK_TCK | ||
| 106 | #define HZ 100.0 | ||
| 107 | #else /* CLK_TCK */ | ||
| 108 | #define HZ ((double)CLK_TCK) | ||
| 109 | #endif | ||
| 110 | #endif | ||
| 111 | |||
| 112 | #define BUFSIZE ((long)1024) | ||
| 113 | long run=0; | ||
| 114 | |||
| 115 | double Time_F(int s); | ||
| 116 | #ifdef SIGALRM | ||
| 117 | #if defined(__STDC__) || defined(sgi) || defined(_AIX) | ||
| 118 | #define SIGRETTYPE void | ||
| 119 | #else | ||
| 120 | #define SIGRETTYPE int | ||
| 121 | #endif | ||
| 122 | |||
| 123 | SIGRETTYPE sig_done(int sig); | ||
| 124 | SIGRETTYPE sig_done(int sig) | ||
| 125 | { | ||
| 126 | signal(SIGALRM,sig_done); | ||
| 127 | run=0; | ||
| 128 | #ifdef LINT | ||
| 129 | sig=sig; | ||
| 130 | #endif | ||
| 131 | } | ||
| 132 | #endif | ||
| 133 | |||
| 134 | #define START 0 | ||
| 135 | #define STOP 1 | ||
| 136 | |||
| 137 | double Time_F(int s) | ||
| 138 | { | ||
| 139 | double ret; | ||
| 140 | #ifdef TIMES | ||
| 141 | static struct tms tstart,tend; | ||
| 142 | |||
| 143 | if (s == START) | ||
| 144 | { | ||
| 145 | times(&tstart); | ||
| 146 | return(0); | ||
| 147 | } | ||
| 148 | else | ||
| 149 | { | ||
| 150 | times(&tend); | ||
| 151 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 152 | return((ret == 0.0)?1e-6:ret); | ||
| 153 | } | ||
| 154 | #else /* !times() */ | ||
| 155 | static struct timeb tstart,tend; | ||
| 156 | long i; | ||
| 157 | |||
| 158 | if (s == START) | ||
| 159 | { | ||
| 160 | ftime(&tstart); | ||
| 161 | return(0); | ||
| 162 | } | ||
| 163 | else | ||
| 164 | { | ||
| 165 | ftime(&tend); | ||
| 166 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 167 | ret=((double)(tend.time-tstart.time))+((double)i)/1e3; | ||
| 168 | return((ret == 0.0)?1e-6:ret); | ||
| 169 | } | ||
| 170 | #endif | ||
| 171 | } | ||
| 172 | |||
| 173 | int main(int argc, char **argv) | ||
| 174 | { | ||
| 175 | long count; | ||
| 176 | static unsigned char buf[BUFSIZE]; | ||
| 177 | static unsigned char key[] ={ | ||
| 178 | 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, | ||
| 179 | 0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10, | ||
| 180 | }; | ||
| 181 | IDEA_KEY_SCHEDULE sch; | ||
| 182 | double a,aa,b,c,d; | ||
| 183 | #ifndef SIGALRM | ||
| 184 | long ca,cca,cb,cc; | ||
| 185 | #endif | ||
| 186 | |||
| 187 | #ifndef TIMES | ||
| 188 | printf("To get the most accurate results, try to run this\n"); | ||
| 189 | printf("program when this computer is idle.\n"); | ||
| 190 | #endif | ||
| 191 | |||
| 192 | #ifndef SIGALRM | ||
| 193 | printf("First we calculate the approximate speed ...\n"); | ||
| 194 | idea_set_encrypt_key(key,&sch); | ||
| 195 | count=10; | ||
| 196 | do { | ||
| 197 | long i; | ||
| 198 | IDEA_INT data[2]; | ||
| 199 | |||
| 200 | count*=2; | ||
| 201 | Time_F(START); | ||
| 202 | for (i=count; i; i--) | ||
| 203 | idea_encrypt(data,&sch); | ||
| 204 | d=Time_F(STOP); | ||
| 205 | } while (d < 3.0); | ||
| 206 | ca=count/4; | ||
| 207 | cca=count/200; | ||
| 208 | cb=count; | ||
| 209 | cc=count*8/BUFSIZE+1; | ||
| 210 | printf("idea_set_encrypt_key %ld times\n",ca); | ||
| 211 | #define COND(d) (count <= (d)) | ||
| 212 | #define COUNT(d) (d) | ||
| 213 | #else | ||
| 214 | #define COND(c) (run) | ||
| 215 | #define COUNT(d) (count) | ||
| 216 | signal(SIGALRM,sig_done); | ||
| 217 | printf("Doing idea_set_encrypt_key for 10 seconds\n"); | ||
| 218 | alarm(10); | ||
| 219 | #endif | ||
| 220 | |||
| 221 | Time_F(START); | ||
| 222 | for (count=0,run=1; COND(ca); count+=4) | ||
| 223 | { | ||
| 224 | idea_set_encrypt_key(key,&sch); | ||
| 225 | idea_set_encrypt_key(key,&sch); | ||
| 226 | idea_set_encrypt_key(key,&sch); | ||
| 227 | idea_set_encrypt_key(key,&sch); | ||
| 228 | } | ||
| 229 | d=Time_F(STOP); | ||
| 230 | printf("%ld idea idea_set_encrypt_key's in %.2f seconds\n",count,d); | ||
| 231 | a=((double)COUNT(ca))/d; | ||
| 232 | |||
| 233 | #ifdef SIGALRM | ||
| 234 | printf("Doing idea_set_decrypt_key for 10 seconds\n"); | ||
| 235 | alarm(10); | ||
| 236 | #else | ||
| 237 | printf("Doing idea_set_decrypt_key %ld times\n",cca); | ||
| 238 | #endif | ||
| 239 | |||
| 240 | Time_F(START); | ||
| 241 | for (count=0,run=1; COND(cca); count+=4) | ||
| 242 | { | ||
| 243 | idea_set_decrypt_key(&sch,&sch); | ||
| 244 | idea_set_decrypt_key(&sch,&sch); | ||
| 245 | idea_set_decrypt_key(&sch,&sch); | ||
| 246 | idea_set_decrypt_key(&sch,&sch); | ||
| 247 | } | ||
| 248 | d=Time_F(STOP); | ||
| 249 | printf("%ld idea idea_set_decrypt_key's in %.2f seconds\n",count,d); | ||
| 250 | aa=((double)COUNT(cca))/d; | ||
| 251 | |||
| 252 | #ifdef SIGALRM | ||
| 253 | printf("Doing idea_encrypt's for 10 seconds\n"); | ||
| 254 | alarm(10); | ||
| 255 | #else | ||
| 256 | printf("Doing idea_encrypt %ld times\n",cb); | ||
| 257 | #endif | ||
| 258 | Time_F(START); | ||
| 259 | for (count=0,run=1; COND(cb); count+=4) | ||
| 260 | { | ||
| 261 | unsigned long data[2]; | ||
| 262 | |||
| 263 | idea_encrypt(data,&sch); | ||
| 264 | idea_encrypt(data,&sch); | ||
| 265 | idea_encrypt(data,&sch); | ||
| 266 | idea_encrypt(data,&sch); | ||
| 267 | } | ||
| 268 | d=Time_F(STOP); | ||
| 269 | printf("%ld idea_encrypt's in %.2f second\n",count,d); | ||
| 270 | b=((double)COUNT(cb)*8)/d; | ||
| 271 | |||
| 272 | #ifdef SIGALRM | ||
| 273 | printf("Doing idea_cbc_encrypt on %ld byte blocks for 10 seconds\n", | ||
| 274 | BUFSIZE); | ||
| 275 | alarm(10); | ||
| 276 | #else | ||
| 277 | printf("Doing idea_cbc_encrypt %ld times on %ld byte blocks\n",cc, | ||
| 278 | BUFSIZE); | ||
| 279 | #endif | ||
| 280 | Time_F(START); | ||
| 281 | for (count=0,run=1; COND(cc); count++) | ||
| 282 | idea_cbc_encrypt(buf,buf,BUFSIZE,&sch, | ||
| 283 | &(key[0]),IDEA_ENCRYPT); | ||
| 284 | d=Time_F(STOP); | ||
| 285 | printf("%ld idea_cbc_encrypt's of %ld byte blocks in %.2f second\n", | ||
| 286 | count,BUFSIZE,d); | ||
| 287 | c=((double)COUNT(cc)*BUFSIZE)/d; | ||
| 288 | |||
| 289 | printf("IDEA set_encrypt_key per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a); | ||
| 290 | printf("IDEA set_decrypt_key per sec = %12.2f (%9.3fuS)\n",aa,1.0e6/aa); | ||
| 291 | printf("IDEA raw ecb bytes per sec = %12.2f (%9.3fuS)\n",b,8.0e6/b); | ||
| 292 | printf("IDEA cbc bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c); | ||
| 293 | exit(0); | ||
| 294 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
| 295 | return(0); | ||
| 296 | #endif | ||
| 297 | } | ||
| 298 | |||
diff --git a/src/lib/libcrypto/idea/version b/src/lib/libcrypto/idea/version deleted file mode 100644 index 3f22293795..0000000000 --- a/src/lib/libcrypto/idea/version +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | 1.1 07/12/95 - eay | ||
| 2 | Many thanks to Rhys Weatherley <rweather@us.oracle.com> | ||
| 3 | for pointing out that I was assuming little endian byte | ||
| 4 | order for all quantities what idea actually used | ||
| 5 | bigendian. No where in the spec does it mention | ||
| 6 | this, it is all in terms of 16 bit numbers and even the example | ||
| 7 | does not use byte streams for the input example :-(. | ||
| 8 | If you byte swap each pair of input, keys and iv, the functions | ||
| 9 | would produce the output as the old version :-(. | ||
| 10 | |||
| 11 | 1.0 ??/??/95 - eay | ||
| 12 | First version. | ||
diff --git a/src/lib/libcrypto/lhash/num.pl b/src/lib/libcrypto/lhash/num.pl deleted file mode 100644 index 30fedf9cd5..0000000000 --- a/src/lib/libcrypto/lhash/num.pl +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | #!/usr/local/bin/perl | ||
| 2 | |||
| 3 | #node 10 -> 4 | ||
| 4 | |||
| 5 | while (<>) | ||
| 6 | { | ||
| 7 | next unless /^node/; | ||
| 8 | chop; | ||
| 9 | @a=split; | ||
| 10 | $num{$a[3]}++; | ||
| 11 | } | ||
| 12 | |||
| 13 | @a=sort {$a <=> $b } keys %num; | ||
| 14 | foreach (0 .. $a[$#a]) | ||
| 15 | { | ||
| 16 | printf "%4d:%4d\n",$_,$num{$_}; | ||
| 17 | } | ||
diff --git a/src/lib/libcrypto/rc2/rc2speed.c b/src/lib/libcrypto/rc2/rc2speed.c deleted file mode 100644 index 1c90ca3e36..0000000000 --- a/src/lib/libcrypto/rc2/rc2speed.c +++ /dev/null | |||
| @@ -1,276 +0,0 @@ | |||
| 1 | /* crypto/rc2/rc2speed.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ | ||
| 60 | /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ | ||
| 61 | |||
| 62 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 63 | #define TIMES | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #include <stdio.h> | ||
| 67 | |||
| 68 | #include <openssl/e_os2.h> | ||
| 69 | #include <unistd.h> | ||
| 70 | |||
| 71 | #ifndef OPENSSL_SYS_NETWARE | ||
| 72 | #include <signal.h> | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #ifndef _IRIX | ||
| 76 | #include <time.h> | ||
| 77 | #endif | ||
| 78 | #ifdef TIMES | ||
| 79 | #include <sys/types.h> | ||
| 80 | #include <sys/times.h> | ||
| 81 | #endif | ||
| 82 | |||
| 83 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 84 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 85 | undefine TIMES, since that tells the rest of the program how things | ||
| 86 | should be handled. -- Richard Levitte */ | ||
| 87 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 88 | #undef TIMES | ||
| 89 | #endif | ||
| 90 | |||
| 91 | #ifndef TIMES | ||
| 92 | #include <sys/timeb.h> | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #if defined(sun) || defined(__ultrix) | ||
| 96 | #define _POSIX_SOURCE | ||
| 97 | #include <limits.h> | ||
| 98 | #include <sys/param.h> | ||
| 99 | #endif | ||
| 100 | |||
| 101 | #include <openssl/rc2.h> | ||
| 102 | |||
| 103 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 104 | #ifndef HZ | ||
| 105 | #ifndef CLK_TCK | ||
| 106 | #define HZ 100.0 | ||
| 107 | #else /* CLK_TCK */ | ||
| 108 | #define HZ ((double)CLK_TCK) | ||
| 109 | #endif /* CLK_TCK */ | ||
| 110 | #endif /* HZ */ | ||
| 111 | |||
| 112 | #define BUFSIZE ((long)1024) | ||
| 113 | long run=0; | ||
| 114 | |||
| 115 | double Time_F(int s); | ||
| 116 | #ifdef SIGALRM | ||
| 117 | #if defined(__STDC__) || defined(sgi) || defined(_AIX) | ||
| 118 | #define SIGRETTYPE void | ||
| 119 | #else | ||
| 120 | #define SIGRETTYPE int | ||
| 121 | #endif | ||
| 122 | |||
| 123 | SIGRETTYPE sig_done(int sig); | ||
| 124 | SIGRETTYPE sig_done(int sig) | ||
| 125 | { | ||
| 126 | signal(SIGALRM,sig_done); | ||
| 127 | run=0; | ||
| 128 | #ifdef LINT | ||
| 129 | sig=sig; | ||
| 130 | #endif | ||
| 131 | } | ||
| 132 | #endif | ||
| 133 | |||
| 134 | #define START 0 | ||
| 135 | #define STOP 1 | ||
| 136 | |||
| 137 | double Time_F(int s) | ||
| 138 | { | ||
| 139 | double ret; | ||
| 140 | #ifdef TIMES | ||
| 141 | static struct tms tstart,tend; | ||
| 142 | |||
| 143 | if (s == START) | ||
| 144 | { | ||
| 145 | times(&tstart); | ||
| 146 | return(0); | ||
| 147 | } | ||
| 148 | else | ||
| 149 | { | ||
| 150 | times(&tend); | ||
| 151 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 152 | return((ret == 0.0)?1e-6:ret); | ||
| 153 | } | ||
| 154 | #else /* !times() */ | ||
| 155 | static struct timeb tstart,tend; | ||
| 156 | long i; | ||
| 157 | |||
| 158 | if (s == START) | ||
| 159 | { | ||
| 160 | ftime(&tstart); | ||
| 161 | return(0); | ||
| 162 | } | ||
| 163 | else | ||
| 164 | { | ||
| 165 | ftime(&tend); | ||
| 166 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 167 | ret=((double)(tend.time-tstart.time))+((double)i)/1e3; | ||
| 168 | return((ret == 0.0)?1e-6:ret); | ||
| 169 | } | ||
| 170 | #endif | ||
| 171 | } | ||
| 172 | |||
| 173 | int main(int argc, char **argv) | ||
| 174 | { | ||
| 175 | long count; | ||
| 176 | static unsigned char buf[BUFSIZE]; | ||
| 177 | static unsigned char key[] ={ | ||
| 178 | 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, | ||
| 179 | 0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10, | ||
| 180 | }; | ||
| 181 | RC2_KEY sch; | ||
| 182 | double a,b,c,d; | ||
| 183 | #ifndef SIGALRM | ||
| 184 | long ca,cb,cc; | ||
| 185 | #endif | ||
| 186 | |||
| 187 | #ifndef TIMES | ||
| 188 | printf("To get the most accurate results, try to run this\n"); | ||
| 189 | printf("program when this computer is idle.\n"); | ||
| 190 | #endif | ||
| 191 | |||
| 192 | #ifndef SIGALRM | ||
| 193 | printf("First we calculate the approximate speed ...\n"); | ||
| 194 | RC2_set_key(&sch,16,key,128); | ||
| 195 | count=10; | ||
| 196 | do { | ||
| 197 | long i; | ||
| 198 | unsigned long data[2]; | ||
| 199 | |||
| 200 | count*=2; | ||
| 201 | Time_F(START); | ||
| 202 | for (i=count; i; i--) | ||
| 203 | RC2_encrypt(data,&sch); | ||
| 204 | d=Time_F(STOP); | ||
| 205 | } while (d < 3.0); | ||
| 206 | ca=count/512; | ||
| 207 | cb=count; | ||
| 208 | cc=count*8/BUFSIZE+1; | ||
| 209 | printf("Doing RC2_set_key %ld times\n",ca); | ||
| 210 | #define COND(d) (count != (d)) | ||
| 211 | #define COUNT(d) (d) | ||
| 212 | #else | ||
| 213 | #define COND(c) (run) | ||
| 214 | #define COUNT(d) (count) | ||
| 215 | signal(SIGALRM,sig_done); | ||
| 216 | printf("Doing RC2_set_key for 10 seconds\n"); | ||
| 217 | alarm(10); | ||
| 218 | #endif | ||
| 219 | |||
| 220 | Time_F(START); | ||
| 221 | for (count=0,run=1; COND(ca); count+=4) | ||
| 222 | { | ||
| 223 | RC2_set_key(&sch,16,key,128); | ||
| 224 | RC2_set_key(&sch,16,key,128); | ||
| 225 | RC2_set_key(&sch,16,key,128); | ||
| 226 | RC2_set_key(&sch,16,key,128); | ||
| 227 | } | ||
| 228 | d=Time_F(STOP); | ||
| 229 | printf("%ld RC2_set_key's in %.2f seconds\n",count,d); | ||
| 230 | a=((double)COUNT(ca))/d; | ||
| 231 | |||
| 232 | #ifdef SIGALRM | ||
| 233 | printf("Doing RC2_encrypt's for 10 seconds\n"); | ||
| 234 | alarm(10); | ||
| 235 | #else | ||
| 236 | printf("Doing RC2_encrypt %ld times\n",cb); | ||
| 237 | #endif | ||
| 238 | Time_F(START); | ||
| 239 | for (count=0,run=1; COND(cb); count+=4) | ||
| 240 | { | ||
| 241 | unsigned long data[2]; | ||
| 242 | |||
| 243 | RC2_encrypt(data,&sch); | ||
| 244 | RC2_encrypt(data,&sch); | ||
| 245 | RC2_encrypt(data,&sch); | ||
| 246 | RC2_encrypt(data,&sch); | ||
| 247 | } | ||
| 248 | d=Time_F(STOP); | ||
| 249 | printf("%ld RC2_encrypt's in %.2f second\n",count,d); | ||
| 250 | b=((double)COUNT(cb)*8)/d; | ||
| 251 | |||
| 252 | #ifdef SIGALRM | ||
| 253 | printf("Doing RC2_cbc_encrypt on %ld byte blocks for 10 seconds\n", | ||
| 254 | BUFSIZE); | ||
| 255 | alarm(10); | ||
| 256 | #else | ||
| 257 | printf("Doing RC2_cbc_encrypt %ld times on %ld byte blocks\n",cc, | ||
| 258 | BUFSIZE); | ||
| 259 | #endif | ||
| 260 | Time_F(START); | ||
| 261 | for (count=0,run=1; COND(cc); count++) | ||
| 262 | RC2_cbc_encrypt(buf,buf,BUFSIZE,&sch, | ||
| 263 | &(key[0]),RC2_ENCRYPT); | ||
| 264 | d=Time_F(STOP); | ||
| 265 | printf("%ld RC2_cbc_encrypt's of %ld byte blocks in %.2f second\n", | ||
| 266 | count,BUFSIZE,d); | ||
| 267 | c=((double)COUNT(cc)*BUFSIZE)/d; | ||
| 268 | |||
| 269 | printf("RC2 set_key per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a); | ||
| 270 | printf("RC2 raw ecb bytes per sec = %12.2f (%9.3fuS)\n",b,8.0e6/b); | ||
| 271 | printf("RC2 cbc bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c); | ||
| 272 | exit(0); | ||
| 273 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
| 274 | return(0); | ||
| 275 | #endif | ||
| 276 | } | ||
diff --git a/src/lib/libcrypto/rc2/tab.c b/src/lib/libcrypto/rc2/tab.c deleted file mode 100644 index 25dc14eeba..0000000000 --- a/src/lib/libcrypto/rc2/tab.c +++ /dev/null | |||
| @@ -1,86 +0,0 @@ | |||
| 1 | #include <stdio.h> | ||
| 2 | |||
| 3 | unsigned char ebits_to_num[256]={ | ||
| 4 | 0xbd,0x56,0xea,0xf2,0xa2,0xf1,0xac,0x2a, | ||
| 5 | 0xb0,0x93,0xd1,0x9c,0x1b,0x33,0xfd,0xd0, | ||
| 6 | 0x30,0x04,0xb6,0xdc,0x7d,0xdf,0x32,0x4b, | ||
| 7 | 0xf7,0xcb,0x45,0x9b,0x31,0xbb,0x21,0x5a, | ||
| 8 | 0x41,0x9f,0xe1,0xd9,0x4a,0x4d,0x9e,0xda, | ||
| 9 | 0xa0,0x68,0x2c,0xc3,0x27,0x5f,0x80,0x36, | ||
| 10 | 0x3e,0xee,0xfb,0x95,0x1a,0xfe,0xce,0xa8, | ||
| 11 | 0x34,0xa9,0x13,0xf0,0xa6,0x3f,0xd8,0x0c, | ||
| 12 | 0x78,0x24,0xaf,0x23,0x52,0xc1,0x67,0x17, | ||
| 13 | 0xf5,0x66,0x90,0xe7,0xe8,0x07,0xb8,0x60, | ||
| 14 | 0x48,0xe6,0x1e,0x53,0xf3,0x92,0xa4,0x72, | ||
| 15 | 0x8c,0x08,0x15,0x6e,0x86,0x00,0x84,0xfa, | ||
| 16 | 0xf4,0x7f,0x8a,0x42,0x19,0xf6,0xdb,0xcd, | ||
| 17 | 0x14,0x8d,0x50,0x12,0xba,0x3c,0x06,0x4e, | ||
| 18 | 0xec,0xb3,0x35,0x11,0xa1,0x88,0x8e,0x2b, | ||
| 19 | 0x94,0x99,0xb7,0x71,0x74,0xd3,0xe4,0xbf, | ||
| 20 | 0x3a,0xde,0x96,0x0e,0xbc,0x0a,0xed,0x77, | ||
| 21 | 0xfc,0x37,0x6b,0x03,0x79,0x89,0x62,0xc6, | ||
| 22 | 0xd7,0xc0,0xd2,0x7c,0x6a,0x8b,0x22,0xa3, | ||
| 23 | 0x5b,0x05,0x5d,0x02,0x75,0xd5,0x61,0xe3, | ||
| 24 | 0x18,0x8f,0x55,0x51,0xad,0x1f,0x0b,0x5e, | ||
| 25 | 0x85,0xe5,0xc2,0x57,0x63,0xca,0x3d,0x6c, | ||
| 26 | 0xb4,0xc5,0xcc,0x70,0xb2,0x91,0x59,0x0d, | ||
| 27 | 0x47,0x20,0xc8,0x4f,0x58,0xe0,0x01,0xe2, | ||
| 28 | 0x16,0x38,0xc4,0x6f,0x3b,0x0f,0x65,0x46, | ||
| 29 | 0xbe,0x7e,0x2d,0x7b,0x82,0xf9,0x40,0xb5, | ||
| 30 | 0x1d,0x73,0xf8,0xeb,0x26,0xc7,0x87,0x97, | ||
| 31 | 0x25,0x54,0xb1,0x28,0xaa,0x98,0x9d,0xa5, | ||
| 32 | 0x64,0x6d,0x7a,0xd4,0x10,0x81,0x44,0xef, | ||
| 33 | 0x49,0xd6,0xae,0x2e,0xdd,0x76,0x5c,0x2f, | ||
| 34 | 0xa7,0x1c,0xc9,0x09,0x69,0x9a,0x83,0xcf, | ||
| 35 | 0x29,0x39,0xb9,0xe9,0x4c,0xff,0x43,0xab, | ||
| 36 | }; | ||
| 37 | |||
| 38 | unsigned char num_to_ebits[256]={ | ||
| 39 | 0x5d,0xbe,0x9b,0x8b,0x11,0x99,0x6e,0x4d, | ||
| 40 | 0x59,0xf3,0x85,0xa6,0x3f,0xb7,0x83,0xc5, | ||
| 41 | 0xe4,0x73,0x6b,0x3a,0x68,0x5a,0xc0,0x47, | ||
| 42 | 0xa0,0x64,0x34,0x0c,0xf1,0xd0,0x52,0xa5, | ||
| 43 | 0xb9,0x1e,0x96,0x43,0x41,0xd8,0xd4,0x2c, | ||
| 44 | 0xdb,0xf8,0x07,0x77,0x2a,0xca,0xeb,0xef, | ||
| 45 | 0x10,0x1c,0x16,0x0d,0x38,0x72,0x2f,0x89, | ||
| 46 | 0xc1,0xf9,0x80,0xc4,0x6d,0xae,0x30,0x3d, | ||
| 47 | 0xce,0x20,0x63,0xfe,0xe6,0x1a,0xc7,0xb8, | ||
| 48 | 0x50,0xe8,0x24,0x17,0xfc,0x25,0x6f,0xbb, | ||
| 49 | 0x6a,0xa3,0x44,0x53,0xd9,0xa2,0x01,0xab, | ||
| 50 | 0xbc,0xb6,0x1f,0x98,0xee,0x9a,0xa7,0x2d, | ||
| 51 | 0x4f,0x9e,0x8e,0xac,0xe0,0xc6,0x49,0x46, | ||
| 52 | 0x29,0xf4,0x94,0x8a,0xaf,0xe1,0x5b,0xc3, | ||
| 53 | 0xb3,0x7b,0x57,0xd1,0x7c,0x9c,0xed,0x87, | ||
| 54 | 0x40,0x8c,0xe2,0xcb,0x93,0x14,0xc9,0x61, | ||
| 55 | 0x2e,0xe5,0xcc,0xf6,0x5e,0xa8,0x5c,0xd6, | ||
| 56 | 0x75,0x8d,0x62,0x95,0x58,0x69,0x76,0xa1, | ||
| 57 | 0x4a,0xb5,0x55,0x09,0x78,0x33,0x82,0xd7, | ||
| 58 | 0xdd,0x79,0xf5,0x1b,0x0b,0xde,0x26,0x21, | ||
| 59 | 0x28,0x74,0x04,0x97,0x56,0xdf,0x3c,0xf0, | ||
| 60 | 0x37,0x39,0xdc,0xff,0x06,0xa4,0xea,0x42, | ||
| 61 | 0x08,0xda,0xb4,0x71,0xb0,0xcf,0x12,0x7a, | ||
| 62 | 0x4e,0xfa,0x6c,0x1d,0x84,0x00,0xc8,0x7f, | ||
| 63 | 0x91,0x45,0xaa,0x2b,0xc2,0xb1,0x8f,0xd5, | ||
| 64 | 0xba,0xf2,0xad,0x19,0xb2,0x67,0x36,0xf7, | ||
| 65 | 0x0f,0x0a,0x92,0x7d,0xe3,0x9d,0xe9,0x90, | ||
| 66 | 0x3e,0x23,0x27,0x66,0x13,0xec,0x81,0x15, | ||
| 67 | 0xbd,0x22,0xbf,0x9f,0x7e,0xa9,0x51,0x4b, | ||
| 68 | 0x4c,0xfb,0x02,0xd3,0x70,0x86,0x31,0xe7, | ||
| 69 | 0x3b,0x05,0x03,0x54,0x60,0x48,0x65,0x18, | ||
| 70 | 0xd2,0xcd,0x5f,0x32,0x88,0x0e,0x35,0xfd, | ||
| 71 | }; | ||
| 72 | |||
| 73 | main() | ||
| 74 | { | ||
| 75 | int i,j; | ||
| 76 | |||
| 77 | for (i=0; i<256; i++) | ||
| 78 | { | ||
| 79 | for (j=0; j<256; j++) | ||
| 80 | if (ebits_to_num[j] == i) | ||
| 81 | { | ||
| 82 | printf("0x%02x,",j); | ||
| 83 | break; | ||
| 84 | } | ||
| 85 | } | ||
| 86 | } | ||
diff --git a/src/lib/libcrypto/rc4/rc4.c b/src/lib/libcrypto/rc4/rc4.c deleted file mode 100644 index c900b26055..0000000000 --- a/src/lib/libcrypto/rc4/rc4.c +++ /dev/null | |||
| @@ -1,193 +0,0 @@ | |||
| 1 | /* crypto/rc4/rc4.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include <stdlib.h> | ||
| 61 | #include <string.h> | ||
| 62 | #include <openssl/rc4.h> | ||
| 63 | #include <openssl/evp.h> | ||
| 64 | |||
| 65 | char *usage[]={ | ||
| 66 | "usage: rc4 args\n", | ||
| 67 | "\n", | ||
| 68 | " -in arg - input file - default stdin\n", | ||
| 69 | " -out arg - output file - default stdout\n", | ||
| 70 | " -key key - password\n", | ||
| 71 | NULL | ||
| 72 | }; | ||
| 73 | |||
| 74 | int main(int argc, char *argv[]) | ||
| 75 | { | ||
| 76 | FILE *in=NULL,*out=NULL; | ||
| 77 | char *infile=NULL,*outfile=NULL,*keystr=NULL; | ||
| 78 | RC4_KEY key; | ||
| 79 | char buf[BUFSIZ]; | ||
| 80 | int badops=0,i; | ||
| 81 | char **pp; | ||
| 82 | unsigned char md[MD5_DIGEST_LENGTH]; | ||
| 83 | |||
| 84 | argc--; | ||
| 85 | argv++; | ||
| 86 | while (argc >= 1) | ||
| 87 | { | ||
| 88 | if (strcmp(*argv,"-in") == 0) | ||
| 89 | { | ||
| 90 | if (--argc < 1) goto bad; | ||
| 91 | infile= *(++argv); | ||
| 92 | } | ||
| 93 | else if (strcmp(*argv,"-out") == 0) | ||
| 94 | { | ||
| 95 | if (--argc < 1) goto bad; | ||
| 96 | outfile= *(++argv); | ||
| 97 | } | ||
| 98 | else if (strcmp(*argv,"-key") == 0) | ||
| 99 | { | ||
| 100 | if (--argc < 1) goto bad; | ||
| 101 | keystr= *(++argv); | ||
| 102 | } | ||
| 103 | else | ||
| 104 | { | ||
| 105 | fprintf(stderr,"unknown option %s\n",*argv); | ||
| 106 | badops=1; | ||
| 107 | break; | ||
| 108 | } | ||
| 109 | argc--; | ||
| 110 | argv++; | ||
| 111 | } | ||
| 112 | |||
| 113 | if (badops) | ||
| 114 | { | ||
| 115 | bad: | ||
| 116 | for (pp=usage; (*pp != NULL); pp++) | ||
| 117 | fprintf(stderr,"%s",*pp); | ||
| 118 | exit(1); | ||
| 119 | } | ||
| 120 | |||
| 121 | if (infile == NULL) | ||
| 122 | in=stdin; | ||
| 123 | else | ||
| 124 | { | ||
| 125 | in=fopen(infile,"r"); | ||
| 126 | if (in == NULL) | ||
| 127 | { | ||
| 128 | perror("open"); | ||
| 129 | exit(1); | ||
| 130 | } | ||
| 131 | |||
| 132 | } | ||
| 133 | if (outfile == NULL) | ||
| 134 | out=stdout; | ||
| 135 | else | ||
| 136 | { | ||
| 137 | out=fopen(outfile,"w"); | ||
| 138 | if (out == NULL) | ||
| 139 | { | ||
| 140 | perror("open"); | ||
| 141 | exit(1); | ||
| 142 | } | ||
| 143 | } | ||
| 144 | |||
| 145 | #ifdef OPENSSL_SYS_MSDOS | ||
| 146 | /* This should set the file to binary mode. */ | ||
| 147 | { | ||
| 148 | #include <fcntl.h> | ||
| 149 | setmode(fileno(in),O_BINARY); | ||
| 150 | setmode(fileno(out),O_BINARY); | ||
| 151 | } | ||
| 152 | #endif | ||
| 153 | |||
| 154 | if (keystr == NULL) | ||
| 155 | { /* get key */ | ||
| 156 | i=EVP_read_pw_string(buf,BUFSIZ,"Enter RC4 password:",0); | ||
| 157 | if (i != 0) | ||
| 158 | { | ||
| 159 | OPENSSL_cleanse(buf,BUFSIZ); | ||
| 160 | fprintf(stderr,"bad password read\n"); | ||
| 161 | exit(1); | ||
| 162 | } | ||
| 163 | keystr=buf; | ||
| 164 | } | ||
| 165 | |||
| 166 | EVP_Digest((unsigned char *)keystr,strlen(keystr),md,NULL,EVP_md5(),NULL); | ||
| 167 | OPENSSL_cleanse(keystr,strlen(keystr)); | ||
| 168 | RC4_set_key(&key,MD5_DIGEST_LENGTH,md); | ||
| 169 | |||
| 170 | for(;;) | ||
| 171 | { | ||
| 172 | i=fread(buf,1,BUFSIZ,in); | ||
| 173 | if (i == 0) break; | ||
| 174 | if (i < 0) | ||
| 175 | { | ||
| 176 | perror("read"); | ||
| 177 | exit(1); | ||
| 178 | } | ||
| 179 | RC4(&key,(unsigned int)i,(unsigned char *)buf, | ||
| 180 | (unsigned char *)buf); | ||
| 181 | i=fwrite(buf,(unsigned int)i,1,out); | ||
| 182 | if (i != 1) | ||
| 183 | { | ||
| 184 | perror("write"); | ||
| 185 | exit(1); | ||
| 186 | } | ||
| 187 | } | ||
| 188 | fclose(out); | ||
| 189 | fclose(in); | ||
| 190 | exit(0); | ||
| 191 | return(1); | ||
| 192 | } | ||
| 193 | |||
diff --git a/src/lib/libcrypto/rc4/rc4speed.c b/src/lib/libcrypto/rc4/rc4speed.c deleted file mode 100644 index a495a73844..0000000000 --- a/src/lib/libcrypto/rc4/rc4speed.c +++ /dev/null | |||
| @@ -1,252 +0,0 @@ | |||
| 1 | /* crypto/rc4/rc4speed.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ | ||
| 60 | /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ | ||
| 61 | |||
| 62 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 63 | #define TIMES | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #include <stdio.h> | ||
| 67 | |||
| 68 | #include <openssl/e_os2.h> | ||
| 69 | #include <unistd.h> | ||
| 70 | |||
| 71 | #ifndef OPENSSL_SYS_NETWARE | ||
| 72 | #include <signal.h> | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #ifndef _IRIX | ||
| 76 | #include <time.h> | ||
| 77 | #endif | ||
| 78 | #ifdef TIMES | ||
| 79 | #include <sys/types.h> | ||
| 80 | #include <sys/times.h> | ||
| 81 | #endif | ||
| 82 | |||
| 83 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 84 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 85 | undefine TIMES, since that tells the rest of the program how things | ||
| 86 | should be handled. -- Richard Levitte */ | ||
| 87 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 88 | #undef TIMES | ||
| 89 | #endif | ||
| 90 | |||
| 91 | #ifndef TIMES | ||
| 92 | #include <sys/timeb.h> | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #if defined(sun) || defined(__ultrix) | ||
| 96 | #define _POSIX_SOURCE | ||
| 97 | #include <limits.h> | ||
| 98 | #include <sys/param.h> | ||
| 99 | #endif | ||
| 100 | |||
| 101 | #include <openssl/rc4.h> | ||
| 102 | |||
| 103 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 104 | #ifndef HZ | ||
| 105 | #ifndef CLK_TCK | ||
| 106 | #define HZ 100.0 | ||
| 107 | #else /* CLK_TCK */ | ||
| 108 | #define HZ ((double)CLK_TCK) | ||
| 109 | #endif | ||
| 110 | #endif | ||
| 111 | |||
| 112 | #define BUFSIZE ((long)1024) | ||
| 113 | long run=0; | ||
| 114 | |||
| 115 | double Time_F(int s); | ||
| 116 | #ifdef SIGALRM | ||
| 117 | #if defined(__STDC__) || defined(sgi) || defined(_AIX) | ||
| 118 | #define SIGRETTYPE void | ||
| 119 | #else | ||
| 120 | #define SIGRETTYPE int | ||
| 121 | #endif | ||
| 122 | |||
| 123 | SIGRETTYPE sig_done(int sig); | ||
| 124 | SIGRETTYPE sig_done(int sig) | ||
| 125 | { | ||
| 126 | signal(SIGALRM,sig_done); | ||
| 127 | run=0; | ||
| 128 | #ifdef LINT | ||
| 129 | sig=sig; | ||
| 130 | #endif | ||
| 131 | } | ||
| 132 | #endif | ||
| 133 | |||
| 134 | #define START 0 | ||
| 135 | #define STOP 1 | ||
| 136 | |||
| 137 | double Time_F(int s) | ||
| 138 | { | ||
| 139 | double ret; | ||
| 140 | #ifdef TIMES | ||
| 141 | static struct tms tstart,tend; | ||
| 142 | |||
| 143 | if (s == START) | ||
| 144 | { | ||
| 145 | times(&tstart); | ||
| 146 | return(0); | ||
| 147 | } | ||
| 148 | else | ||
| 149 | { | ||
| 150 | times(&tend); | ||
| 151 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 152 | return((ret == 0.0)?1e-6:ret); | ||
| 153 | } | ||
| 154 | #else /* !times() */ | ||
| 155 | static struct timeb tstart,tend; | ||
| 156 | long i; | ||
| 157 | |||
| 158 | if (s == START) | ||
| 159 | { | ||
| 160 | ftime(&tstart); | ||
| 161 | return(0); | ||
| 162 | } | ||
| 163 | else | ||
| 164 | { | ||
| 165 | ftime(&tend); | ||
| 166 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 167 | ret=((double)(tend.time-tstart.time))+((double)i)/1e3; | ||
| 168 | return((ret == 0.0)?1e-6:ret); | ||
| 169 | } | ||
| 170 | #endif | ||
| 171 | } | ||
| 172 | |||
| 173 | int main(int argc, char **argv) | ||
| 174 | { | ||
| 175 | long count; | ||
| 176 | static unsigned char buf[BUFSIZE]; | ||
| 177 | static unsigned char key[] ={ | ||
| 178 | 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, | ||
| 179 | 0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10, | ||
| 180 | }; | ||
| 181 | RC4_KEY sch; | ||
| 182 | double a,b,c,d; | ||
| 183 | #ifndef SIGALRM | ||
| 184 | long ca,cb,cc; | ||
| 185 | #endif | ||
| 186 | |||
| 187 | #ifndef TIMES | ||
| 188 | printf("To get the most accurate results, try to run this\n"); | ||
| 189 | printf("program when this computer is idle.\n"); | ||
| 190 | #endif | ||
| 191 | |||
| 192 | #ifndef SIGALRM | ||
| 193 | printf("First we calculate the approximate speed ...\n"); | ||
| 194 | RC4_set_key(&sch,16,key); | ||
| 195 | count=10; | ||
| 196 | do { | ||
| 197 | long i; | ||
| 198 | unsigned long data[2]; | ||
| 199 | |||
| 200 | count*=2; | ||
| 201 | Time_F(START); | ||
| 202 | for (i=count; i; i--) | ||
| 203 | RC4(&sch,8,buf,buf); | ||
| 204 | d=Time_F(STOP); | ||
| 205 | } while (d < 3.0); | ||
| 206 | ca=count/512; | ||
| 207 | cc=count*8/BUFSIZE+1; | ||
| 208 | printf("Doing RC4_set_key %ld times\n",ca); | ||
| 209 | #define COND(d) (count != (d)) | ||
| 210 | #define COUNT(d) (d) | ||
| 211 | #else | ||
| 212 | #define COND(c) (run) | ||
| 213 | #define COUNT(d) (count) | ||
| 214 | signal(SIGALRM,sig_done); | ||
| 215 | printf("Doing RC4_set_key for 10 seconds\n"); | ||
| 216 | alarm(10); | ||
| 217 | #endif | ||
| 218 | |||
| 219 | Time_F(START); | ||
| 220 | for (count=0,run=1; COND(ca); count+=4) | ||
| 221 | { | ||
| 222 | RC4_set_key(&sch,16,key); | ||
| 223 | RC4_set_key(&sch,16,key); | ||
| 224 | RC4_set_key(&sch,16,key); | ||
| 225 | RC4_set_key(&sch,16,key); | ||
| 226 | } | ||
| 227 | d=Time_F(STOP); | ||
| 228 | printf("%ld RC4_set_key's in %.2f seconds\n",count,d); | ||
| 229 | a=((double)COUNT(ca))/d; | ||
| 230 | |||
| 231 | #ifdef SIGALRM | ||
| 232 | printf("Doing RC4 on %ld byte blocks for 10 seconds\n",BUFSIZE); | ||
| 233 | alarm(10); | ||
| 234 | #else | ||
| 235 | printf("Doing RC4 %ld times on %ld byte blocks\n",cc,BUFSIZE); | ||
| 236 | #endif | ||
| 237 | Time_F(START); | ||
| 238 | for (count=0,run=1; COND(cc); count++) | ||
| 239 | RC4(&sch,BUFSIZE,buf,buf); | ||
| 240 | d=Time_F(STOP); | ||
| 241 | printf("%ld RC4's of %ld byte blocks in %.2f second\n", | ||
| 242 | count,BUFSIZE,d); | ||
| 243 | c=((double)COUNT(cc)*BUFSIZE)/d; | ||
| 244 | |||
| 245 | printf("RC4 set_key per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a); | ||
| 246 | printf("RC4 bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c); | ||
| 247 | exit(0); | ||
| 248 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
| 249 | return(0); | ||
| 250 | #endif | ||
| 251 | } | ||
| 252 | |||
diff --git a/src/lib/libcrypto/sha/sha.c b/src/lib/libcrypto/sha/sha.c deleted file mode 100644 index 42126551d1..0000000000 --- a/src/lib/libcrypto/sha/sha.c +++ /dev/null | |||
| @@ -1,124 +0,0 @@ | |||
| 1 | /* crypto/sha/sha.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include <stdlib.h> | ||
| 61 | #include <openssl/sha.h> | ||
| 62 | |||
| 63 | #define BUFSIZE 1024*16 | ||
| 64 | |||
| 65 | void do_fp(FILE *f); | ||
| 66 | void pt(unsigned char *md); | ||
| 67 | int read(int, void *, unsigned int); | ||
| 68 | int main(int argc, char **argv) | ||
| 69 | { | ||
| 70 | int i,err=0; | ||
| 71 | FILE *IN; | ||
| 72 | |||
| 73 | if (argc == 1) | ||
| 74 | { | ||
| 75 | do_fp(stdin); | ||
| 76 | } | ||
| 77 | else | ||
| 78 | { | ||
| 79 | for (i=1; i<argc; i++) | ||
| 80 | { | ||
| 81 | IN=fopen(argv[i],"r"); | ||
| 82 | if (IN == NULL) | ||
| 83 | { | ||
| 84 | perror(argv[i]); | ||
| 85 | err++; | ||
| 86 | continue; | ||
| 87 | } | ||
| 88 | printf("SHA(%s)= ",argv[i]); | ||
| 89 | do_fp(IN); | ||
| 90 | fclose(IN); | ||
| 91 | } | ||
| 92 | } | ||
| 93 | exit(err); | ||
| 94 | } | ||
| 95 | |||
| 96 | void do_fp(FILE *f) | ||
| 97 | { | ||
| 98 | SHA_CTX c; | ||
| 99 | unsigned char md[SHA_DIGEST_LENGTH]; | ||
| 100 | int fd; | ||
| 101 | int i; | ||
| 102 | unsigned char buf[BUFSIZE]; | ||
| 103 | |||
| 104 | fd=fileno(f); | ||
| 105 | SHA_Init(&c); | ||
| 106 | for (;;) | ||
| 107 | { | ||
| 108 | i=read(fd,buf,BUFSIZE); | ||
| 109 | if (i <= 0) break; | ||
| 110 | SHA_Update(&c,buf,(unsigned long)i); | ||
| 111 | } | ||
| 112 | SHA_Final(&(md[0]),&c); | ||
| 113 | pt(md); | ||
| 114 | } | ||
| 115 | |||
| 116 | void pt(unsigned char *md) | ||
| 117 | { | ||
| 118 | int i; | ||
| 119 | |||
| 120 | for (i=0; i<SHA_DIGEST_LENGTH; i++) | ||
| 121 | printf("%02x",md[i]); | ||
| 122 | printf("\n"); | ||
| 123 | } | ||
| 124 | |||
diff --git a/src/lib/libcrypto/sha/sha1.c b/src/lib/libcrypto/sha/sha1.c deleted file mode 100644 index fd56a1e756..0000000000 --- a/src/lib/libcrypto/sha/sha1.c +++ /dev/null | |||
| @@ -1,125 +0,0 @@ | |||
| 1 | /* crypto/sha/sha1.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <unistd.h> | ||
| 60 | #include <stdio.h> | ||
| 61 | #include <stdlib.h> | ||
| 62 | #include <openssl/sha.h> | ||
| 63 | |||
| 64 | #define BUFSIZE 1024*16 | ||
| 65 | |||
| 66 | void do_fp(FILE *f); | ||
| 67 | void pt(unsigned char *md); | ||
| 68 | |||
| 69 | int main(int argc, char **argv) | ||
| 70 | { | ||
| 71 | int i,err=0; | ||
| 72 | FILE *IN; | ||
| 73 | |||
| 74 | if (argc == 1) | ||
| 75 | { | ||
| 76 | do_fp(stdin); | ||
| 77 | } | ||
| 78 | else | ||
| 79 | { | ||
| 80 | for (i=1; i<argc; i++) | ||
| 81 | { | ||
| 82 | IN=fopen(argv[i],"r"); | ||
| 83 | if (IN == NULL) | ||
| 84 | { | ||
| 85 | perror(argv[i]); | ||
| 86 | err++; | ||
| 87 | continue; | ||
| 88 | } | ||
| 89 | printf("SHA1(%s)= ",argv[i]); | ||
| 90 | do_fp(IN); | ||
| 91 | fclose(IN); | ||
| 92 | } | ||
| 93 | } | ||
| 94 | exit(err); | ||
| 95 | } | ||
| 96 | |||
| 97 | void do_fp(FILE *f) | ||
| 98 | { | ||
| 99 | SHA_CTX c; | ||
| 100 | unsigned char md[SHA_DIGEST_LENGTH]; | ||
| 101 | int fd; | ||
| 102 | int i; | ||
| 103 | unsigned char buf[BUFSIZE]; | ||
| 104 | |||
| 105 | fd=fileno(f); | ||
| 106 | SHA1_Init(&c); | ||
| 107 | for (;;) | ||
| 108 | { | ||
| 109 | i=read(fd,buf,BUFSIZE); | ||
| 110 | if (i <= 0) break; | ||
| 111 | SHA1_Update(&c,buf,(unsigned long)i); | ||
| 112 | } | ||
| 113 | SHA1_Final(&(md[0]),&c); | ||
| 114 | pt(md); | ||
| 115 | } | ||
| 116 | |||
| 117 | void pt(unsigned char *md) | ||
| 118 | { | ||
| 119 | int i; | ||
| 120 | |||
| 121 | for (i=0; i<SHA_DIGEST_LENGTH; i++) | ||
| 122 | printf("%02x",md[i]); | ||
| 123 | printf("\n"); | ||
| 124 | } | ||
| 125 | |||
diff --git a/src/lib/libssl/src/FAQ b/src/lib/libssl/src/FAQ deleted file mode 100644 index 59d135396e..0000000000 --- a/src/lib/libssl/src/FAQ +++ /dev/null | |||
| @@ -1,1044 +0,0 @@ | |||
| 1 | OpenSSL - Frequently Asked Questions | ||
| 2 | -------------------------------------- | ||
| 3 | |||
| 4 | [MISC] Miscellaneous questions | ||
| 5 | |||
| 6 | * Which is the current version of OpenSSL? | ||
| 7 | * Where is the documentation? | ||
| 8 | * How can I contact the OpenSSL developers? | ||
| 9 | * Where can I get a compiled version of OpenSSL? | ||
| 10 | * Why aren't tools like 'autoconf' and 'libtool' used? | ||
| 11 | * What is an 'engine' version? | ||
| 12 | * How do I check the authenticity of the OpenSSL distribution? | ||
| 13 | * How does the versioning scheme work? | ||
| 14 | |||
| 15 | [LEGAL] Legal questions | ||
| 16 | |||
| 17 | * Do I need patent licenses to use OpenSSL? | ||
| 18 | * Can I use OpenSSL with GPL software? | ||
| 19 | |||
| 20 | [USER] Questions on using the OpenSSL applications | ||
| 21 | |||
| 22 | * Why do I get a "PRNG not seeded" error message? | ||
| 23 | * Why do I get an "unable to write 'random state'" error message? | ||
| 24 | * How do I create certificates or certificate requests? | ||
| 25 | * Why can't I create certificate requests? | ||
| 26 | * Why does <SSL program> fail with a certificate verify error? | ||
| 27 | * Why can I only use weak ciphers when I connect to a server using OpenSSL? | ||
| 28 | * How can I create DSA certificates? | ||
| 29 | * Why can't I make an SSL connection using a DSA certificate? | ||
| 30 | * How can I remove the passphrase on a private key? | ||
| 31 | * Why can't I use OpenSSL certificates with SSL client authentication? | ||
| 32 | * Why does my browser give a warning about a mismatched hostname? | ||
| 33 | * How do I install a CA certificate into a browser? | ||
| 34 | * Why is OpenSSL x509 DN output not conformant to RFC2253? | ||
| 35 | * What is a "128 bit certificate"? Can I create one with OpenSSL? | ||
| 36 | * Why does OpenSSL set the authority key identifier extension incorrectly? | ||
| 37 | * How can I set up a bundle of commercial root CA certificates? | ||
| 38 | |||
| 39 | [BUILD] Questions about building and testing OpenSSL | ||
| 40 | |||
| 41 | * Why does the linker complain about undefined symbols? | ||
| 42 | * Why does the OpenSSL test fail with "bc: command not found"? | ||
| 43 | * Why does the OpenSSL test fail with "bc: 1 no implemented"? | ||
| 44 | * Why does the OpenSSL test fail with "bc: stack empty"? | ||
| 45 | * Why does the OpenSSL compilation fail on Alpha Tru64 Unix? | ||
| 46 | * Why does the OpenSSL compilation fail with "ar: command not found"? | ||
| 47 | * Why does the OpenSSL compilation fail on Win32 with VC++? | ||
| 48 | * What is special about OpenSSL on Redhat? | ||
| 49 | * Why does the OpenSSL compilation fail on MacOS X? | ||
| 50 | * Why does the OpenSSL test suite fail on MacOS X? | ||
| 51 | * Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]? | ||
| 52 | * Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"? | ||
| 53 | * Why does the OpenSSL test suite fail in sha512t on x86 CPU? | ||
| 54 | * Why does compiler fail to compile sha512.c? | ||
| 55 | * Test suite still fails, what to do? | ||
| 56 | * I think I've found a bug, what should I do? | ||
| 57 | * I'm SURE I've found a bug, how do I report it? | ||
| 58 | * I've found a security issue, how do I report it? | ||
| 59 | |||
| 60 | [PROG] Questions about programming with OpenSSL | ||
| 61 | |||
| 62 | * Is OpenSSL thread-safe? | ||
| 63 | * I've compiled a program under Windows and it crashes: why? | ||
| 64 | * How do I read or write a DER encoded buffer using the ASN1 functions? | ||
| 65 | * OpenSSL uses DER but I need BER format: does OpenSSL support BER? | ||
| 66 | * I've tried using <M_some_evil_pkcs12_macro> and I get errors why? | ||
| 67 | * I've called <some function> and it fails, why? | ||
| 68 | * I just get a load of numbers for the error output, what do they mean? | ||
| 69 | * Why do I get errors about unknown algorithms? | ||
| 70 | * Why can't the OpenSSH configure script detect OpenSSL? | ||
| 71 | * Can I use OpenSSL's SSL library with non-blocking I/O? | ||
| 72 | * Why doesn't my server application receive a client certificate? | ||
| 73 | * Why does compilation fail due to an undefined symbol NID_uniqueIdentifier? | ||
| 74 | * I think I've detected a memory leak, is this a bug? | ||
| 75 | * Why does Valgrind complain about the use of uninitialized data? | ||
| 76 | * Why doesn't a memory BIO work when a file does? | ||
| 77 | * Where are the declarations and implementations of d2i_X509() etc? | ||
| 78 | |||
| 79 | =============================================================================== | ||
| 80 | |||
| 81 | [MISC] ======================================================================== | ||
| 82 | |||
| 83 | * Which is the current version of OpenSSL? | ||
| 84 | |||
| 85 | The current version is available from <URL: http://www.openssl.org>. | ||
| 86 | OpenSSL 1.0.1e was released on Feb 11th, 2013. | ||
| 87 | |||
| 88 | In addition to the current stable release, you can also access daily | ||
| 89 | snapshots of the OpenSSL development version at <URL: | ||
| 90 | ftp://ftp.openssl.org/snapshot/>, or get it by anonymous Git access. | ||
| 91 | |||
| 92 | |||
| 93 | * Where is the documentation? | ||
| 94 | |||
| 95 | OpenSSL is a library that provides cryptographic functionality to | ||
| 96 | applications such as secure web servers. Be sure to read the | ||
| 97 | documentation of the application you want to use. The INSTALL file | ||
| 98 | explains how to install this library. | ||
| 99 | |||
| 100 | OpenSSL includes a command line utility that can be used to perform a | ||
| 101 | variety of cryptographic functions. It is described in the openssl(1) | ||
| 102 | manpage. Documentation for developers is currently being written. Many | ||
| 103 | manual pages are available; overviews over libcrypto and | ||
| 104 | libssl are given in the crypto(3) and ssl(3) manpages. | ||
| 105 | |||
| 106 | The OpenSSL manpages are installed in /usr/local/ssl/man/ (or a | ||
| 107 | different directory if you specified one as described in INSTALL). | ||
| 108 | In addition, you can read the most current versions at | ||
| 109 | <URL: http://www.openssl.org/docs/>. Note that the online documents refer | ||
| 110 | to the very latest development versions of OpenSSL and may include features | ||
| 111 | not present in released versions. If in doubt refer to the documentation | ||
| 112 | that came with the version of OpenSSL you are using. The pod format | ||
| 113 | documentation is included in each OpenSSL distribution under the docs | ||
| 114 | directory. | ||
| 115 | |||
| 116 | For information on parts of libcrypto that are not yet documented, you | ||
| 117 | might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's | ||
| 118 | predecessor, at <URL: http://www.columbia.edu/~ariel/ssleay/>. Much | ||
| 119 | of this still applies to OpenSSL. | ||
| 120 | |||
| 121 | There is some documentation about certificate extensions and PKCS#12 | ||
| 122 | in doc/openssl.txt | ||
| 123 | |||
| 124 | The original SSLeay documentation is included in OpenSSL as | ||
| 125 | doc/ssleay.txt. It may be useful when none of the other resources | ||
| 126 | help, but please note that it reflects the obsolete version SSLeay | ||
| 127 | 0.6.6. | ||
| 128 | |||
| 129 | |||
| 130 | * How can I contact the OpenSSL developers? | ||
| 131 | |||
| 132 | The README file describes how to submit bug reports and patches to | ||
| 133 | OpenSSL. Information on the OpenSSL mailing lists is available from | ||
| 134 | <URL: http://www.openssl.org>. | ||
| 135 | |||
| 136 | |||
| 137 | * Where can I get a compiled version of OpenSSL? | ||
| 138 | |||
| 139 | You can finder pointers to binary distributions in | ||
| 140 | <URL: http://www.openssl.org/related/binaries.html> . | ||
| 141 | |||
| 142 | Some applications that use OpenSSL are distributed in binary form. | ||
| 143 | When using such an application, you don't need to install OpenSSL | ||
| 144 | yourself; the application will include the required parts (e.g. DLLs). | ||
| 145 | |||
| 146 | If you want to build OpenSSL on a Windows system and you don't have | ||
| 147 | a C compiler, read the "Mingw32" section of INSTALL.W32 for information | ||
| 148 | on how to obtain and install the free GNU C compiler. | ||
| 149 | |||
| 150 | A number of Linux and *BSD distributions include OpenSSL. | ||
| 151 | |||
| 152 | |||
| 153 | * Why aren't tools like 'autoconf' and 'libtool' used? | ||
| 154 | |||
| 155 | autoconf will probably be used in future OpenSSL versions. If it was | ||
| 156 | less Unix-centric, it might have been used much earlier. | ||
| 157 | |||
| 158 | * What is an 'engine' version? | ||
| 159 | |||
| 160 | With version 0.9.6 OpenSSL was extended to interface to external crypto | ||
| 161 | hardware. This was realized in a special release '0.9.6-engine'. With | ||
| 162 | version 0.9.7 the changes were merged into the main development line, | ||
| 163 | so that the special release is no longer necessary. | ||
| 164 | |||
| 165 | * How do I check the authenticity of the OpenSSL distribution? | ||
| 166 | |||
| 167 | We provide MD5 digests and ASC signatures of each tarball. | ||
| 168 | Use MD5 to check that a tarball from a mirror site is identical: | ||
| 169 | |||
| 170 | md5sum TARBALL | awk '{print $1;}' | cmp - TARBALL.md5 | ||
| 171 | |||
| 172 | You can check authenticity using pgp or gpg. You need the OpenSSL team | ||
| 173 | member public key used to sign it (download it from a key server, see a | ||
| 174 | list of keys at <URL: http://www.openssl.org/about/>). Then | ||
| 175 | just do: | ||
| 176 | |||
| 177 | pgp TARBALL.asc | ||
| 178 | |||
| 179 | * How does the versioning scheme work? | ||
| 180 | |||
| 181 | After the release of OpenSSL 1.0.0 the versioning scheme changed. Letter | ||
| 182 | releases (e.g. 1.0.1a) can only contain bug and security fixes and no | ||
| 183 | new features. Minor releases change the last number (e.g. 1.0.2) and | ||
| 184 | can contain new features that retain binary compatibility. Changes to | ||
| 185 | the middle number are considered major releases and neither source nor | ||
| 186 | binary compatibility is guaranteed. | ||
| 187 | |||
| 188 | Therefore the answer to the common question "when will feature X be | ||
| 189 | backported to OpenSSL 1.0.0/0.9.8?" is "never" but it could appear | ||
| 190 | in the next minor release. | ||
| 191 | |||
| 192 | [LEGAL] ======================================================================= | ||
| 193 | |||
| 194 | * Do I need patent licenses to use OpenSSL? | ||
| 195 | |||
| 196 | The patents section of the README file lists patents that may apply to | ||
| 197 | you if you want to use OpenSSL. For information on intellectual | ||
| 198 | property rights, please consult a lawyer. The OpenSSL team does not | ||
| 199 | offer legal advice. | ||
| 200 | |||
| 201 | You can configure OpenSSL so as not to use IDEA, MDC2 and RC5 by using | ||
| 202 | ./config no-idea no-mdc2 no-rc5 | ||
| 203 | |||
| 204 | |||
| 205 | * Can I use OpenSSL with GPL software? | ||
| 206 | |||
| 207 | On many systems including the major Linux and BSD distributions, yes (the | ||
| 208 | GPL does not place restrictions on using libraries that are part of the | ||
| 209 | normal operating system distribution). | ||
| 210 | |||
| 211 | On other systems, the situation is less clear. Some GPL software copyright | ||
| 212 | holders claim that you infringe on their rights if you use OpenSSL with | ||
| 213 | their software on operating systems that don't normally include OpenSSL. | ||
| 214 | |||
| 215 | If you develop open source software that uses OpenSSL, you may find it | ||
| 216 | useful to choose an other license than the GPL, or state explicitly that | ||
| 217 | "This program is released under the GPL with the additional exemption that | ||
| 218 | compiling, linking, and/or using OpenSSL is allowed." If you are using | ||
| 219 | GPL software developed by others, you may want to ask the copyright holder | ||
| 220 | for permission to use their software with OpenSSL. | ||
| 221 | |||
| 222 | |||
| 223 | [USER] ======================================================================== | ||
| 224 | |||
| 225 | * Why do I get a "PRNG not seeded" error message? | ||
| 226 | |||
| 227 | Cryptographic software needs a source of unpredictable data to work | ||
| 228 | correctly. Many open source operating systems provide a "randomness | ||
| 229 | device" (/dev/urandom or /dev/random) that serves this purpose. | ||
| 230 | All OpenSSL versions try to use /dev/urandom by default; starting with | ||
| 231 | version 0.9.7, OpenSSL also tries /dev/random if /dev/urandom is not | ||
| 232 | available. | ||
| 233 | |||
| 234 | On other systems, applications have to call the RAND_add() or | ||
| 235 | RAND_seed() function with appropriate data before generating keys or | ||
| 236 | performing public key encryption. (These functions initialize the | ||
| 237 | pseudo-random number generator, PRNG.) Some broken applications do | ||
| 238 | not do this. As of version 0.9.5, the OpenSSL functions that need | ||
| 239 | randomness report an error if the random number generator has not been | ||
| 240 | seeded with at least 128 bits of randomness. If this error occurs and | ||
| 241 | is not discussed in the documentation of the application you are | ||
| 242 | using, please contact the author of that application; it is likely | ||
| 243 | that it never worked correctly. OpenSSL 0.9.5 and later make the | ||
| 244 | error visible by refusing to perform potentially insecure encryption. | ||
| 245 | |||
| 246 | If you are using Solaris 8, you can add /dev/urandom and /dev/random | ||
| 247 | devices by installing patch 112438 (Sparc) or 112439 (x86), which are | ||
| 248 | available via the Patchfinder at <URL: http://sunsolve.sun.com> | ||
| 249 | (Solaris 9 includes these devices by default). For /dev/random support | ||
| 250 | for earlier Solaris versions, see Sun's statement at | ||
| 251 | <URL: http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsrdb/27606&zone_32=SUNWski> | ||
| 252 | (the SUNWski package is available in patch 105710). | ||
| 253 | |||
| 254 | On systems without /dev/urandom and /dev/random, it is a good idea to | ||
| 255 | use the Entropy Gathering Demon (EGD); see the RAND_egd() manpage for | ||
| 256 | details. Starting with version 0.9.7, OpenSSL will automatically look | ||
| 257 | for an EGD socket at /var/run/egd-pool, /dev/egd-pool, /etc/egd-pool and | ||
| 258 | /etc/entropy. | ||
| 259 | |||
| 260 | Most components of the openssl command line utility automatically try | ||
| 261 | to seed the random number generator from a file. The name of the | ||
| 262 | default seeding file is determined as follows: If environment variable | ||
| 263 | RANDFILE is set, then it names the seeding file. Otherwise if | ||
| 264 | environment variable HOME is set, then the seeding file is $HOME/.rnd. | ||
| 265 | If neither RANDFILE nor HOME is set, versions up to OpenSSL 0.9.6 will | ||
| 266 | use file .rnd in the current directory while OpenSSL 0.9.6a uses no | ||
| 267 | default seeding file at all. OpenSSL 0.9.6b and later will behave | ||
| 268 | similarly to 0.9.6a, but will use a default of "C:\" for HOME on | ||
| 269 | Windows systems if the environment variable has not been set. | ||
| 270 | |||
| 271 | If the default seeding file does not exist or is too short, the "PRNG | ||
| 272 | not seeded" error message may occur. | ||
| 273 | |||
| 274 | The openssl command line utility will write back a new state to the | ||
| 275 | default seeding file (and create this file if necessary) unless | ||
| 276 | there was no sufficient seeding. | ||
| 277 | |||
| 278 | Pointing $RANDFILE to an Entropy Gathering Daemon socket does not work. | ||
| 279 | Use the "-rand" option of the OpenSSL command line tools instead. | ||
| 280 | The $RANDFILE environment variable and $HOME/.rnd are only used by the | ||
| 281 | OpenSSL command line tools. Applications using the OpenSSL library | ||
| 282 | provide their own configuration options to specify the entropy source, | ||
| 283 | please check out the documentation coming the with application. | ||
| 284 | |||
| 285 | |||
| 286 | * Why do I get an "unable to write 'random state'" error message? | ||
| 287 | |||
| 288 | |||
| 289 | Sometimes the openssl command line utility does not abort with | ||
| 290 | a "PRNG not seeded" error message, but complains that it is | ||
| 291 | "unable to write 'random state'". This message refers to the | ||
| 292 | default seeding file (see previous answer). A possible reason | ||
| 293 | is that no default filename is known because neither RANDFILE | ||
| 294 | nor HOME is set. (Versions up to 0.9.6 used file ".rnd" in the | ||
| 295 | current directory in this case, but this has changed with 0.9.6a.) | ||
| 296 | |||
| 297 | |||
| 298 | * How do I create certificates or certificate requests? | ||
| 299 | |||
| 300 | Check out the CA.pl(1) manual page. This provides a simple wrapper round | ||
| 301 | the 'req', 'verify', 'ca' and 'pkcs12' utilities. For finer control check | ||
| 302 | out the manual pages for the individual utilities and the certificate | ||
| 303 | extensions documentation (in ca(1), req(1), x509v3_config(5) ) | ||
| 304 | |||
| 305 | |||
| 306 | * Why can't I create certificate requests? | ||
| 307 | |||
| 308 | You typically get the error: | ||
| 309 | |||
| 310 | unable to find 'distinguished_name' in config | ||
| 311 | problems making Certificate Request | ||
| 312 | |||
| 313 | This is because it can't find the configuration file. Check out the | ||
| 314 | DIAGNOSTICS section of req(1) for more information. | ||
| 315 | |||
| 316 | |||
| 317 | * Why does <SSL program> fail with a certificate verify error? | ||
| 318 | |||
| 319 | This problem is usually indicated by log messages saying something like | ||
| 320 | "unable to get local issuer certificate" or "self signed certificate". | ||
| 321 | When a certificate is verified its root CA must be "trusted" by OpenSSL | ||
| 322 | this typically means that the CA certificate must be placed in a directory | ||
| 323 | or file and the relevant program configured to read it. The OpenSSL program | ||
| 324 | 'verify' behaves in a similar way and issues similar error messages: check | ||
| 325 | the verify(1) program manual page for more information. | ||
| 326 | |||
| 327 | |||
| 328 | * Why can I only use weak ciphers when I connect to a server using OpenSSL? | ||
| 329 | |||
| 330 | This is almost certainly because you are using an old "export grade" browser | ||
| 331 | which only supports weak encryption. Upgrade your browser to support 128 bit | ||
| 332 | ciphers. | ||
| 333 | |||
| 334 | |||
| 335 | * How can I create DSA certificates? | ||
| 336 | |||
| 337 | Check the CA.pl(1) manual page for a DSA certificate example. | ||
| 338 | |||
| 339 | |||
| 340 | * Why can't I make an SSL connection to a server using a DSA certificate? | ||
| 341 | |||
| 342 | Typically you'll see a message saying there are no shared ciphers when | ||
| 343 | the same setup works fine with an RSA certificate. There are two possible | ||
| 344 | causes. The client may not support connections to DSA servers most web | ||
| 345 | browsers (including Netscape and MSIE) only support connections to servers | ||
| 346 | supporting RSA cipher suites. The other cause is that a set of DH parameters | ||
| 347 | has not been supplied to the server. DH parameters can be created with the | ||
| 348 | dhparam(1) command and loaded using the SSL_CTX_set_tmp_dh() for example: | ||
| 349 | check the source to s_server in apps/s_server.c for an example. | ||
| 350 | |||
| 351 | |||
| 352 | * How can I remove the passphrase on a private key? | ||
| 353 | |||
| 354 | Firstly you should be really *really* sure you want to do this. Leaving | ||
| 355 | a private key unencrypted is a major security risk. If you decide that | ||
| 356 | you do have to do this check the EXAMPLES sections of the rsa(1) and | ||
| 357 | dsa(1) manual pages. | ||
| 358 | |||
| 359 | |||
| 360 | * Why can't I use OpenSSL certificates with SSL client authentication? | ||
| 361 | |||
| 362 | What will typically happen is that when a server requests authentication | ||
| 363 | it will either not include your certificate or tell you that you have | ||
| 364 | no client certificates (Netscape) or present you with an empty list box | ||
| 365 | (MSIE). The reason for this is that when a server requests a client | ||
| 366 | certificate it includes a list of CAs names which it will accept. Browsers | ||
| 367 | will only let you select certificates from the list on the grounds that | ||
| 368 | there is little point presenting a certificate which the server will | ||
| 369 | reject. | ||
| 370 | |||
| 371 | The solution is to add the relevant CA certificate to your servers "trusted | ||
| 372 | CA list". How you do this depends on the server software in uses. You can | ||
| 373 | print out the servers list of acceptable CAs using the OpenSSL s_client tool: | ||
| 374 | |||
| 375 | openssl s_client -connect www.some.host:443 -prexit | ||
| 376 | |||
| 377 | If your server only requests certificates on certain URLs then you may need | ||
| 378 | to manually issue an HTTP GET command to get the list when s_client connects: | ||
| 379 | |||
| 380 | GET /some/page/needing/a/certificate.html | ||
| 381 | |||
| 382 | If your CA does not appear in the list then this confirms the problem. | ||
| 383 | |||
| 384 | |||
| 385 | * Why does my browser give a warning about a mismatched hostname? | ||
| 386 | |||
| 387 | Browsers expect the server's hostname to match the value in the commonName | ||
| 388 | (CN) field of the certificate. If it does not then you get a warning. | ||
| 389 | |||
| 390 | |||
| 391 | * How do I install a CA certificate into a browser? | ||
| 392 | |||
| 393 | The usual way is to send the DER encoded certificate to the browser as | ||
| 394 | MIME type application/x-x509-ca-cert, for example by clicking on an appropriate | ||
| 395 | link. On MSIE certain extensions such as .der or .cacert may also work, or you | ||
| 396 | can import the certificate using the certificate import wizard. | ||
| 397 | |||
| 398 | You can convert a certificate to DER form using the command: | ||
| 399 | |||
| 400 | openssl x509 -in ca.pem -outform DER -out ca.der | ||
| 401 | |||
| 402 | Occasionally someone suggests using a command such as: | ||
| 403 | |||
| 404 | openssl pkcs12 -export -out cacert.p12 -in cacert.pem -inkey cakey.pem | ||
| 405 | |||
| 406 | DO NOT DO THIS! This command will give away your CAs private key and | ||
| 407 | reduces its security to zero: allowing anyone to forge certificates in | ||
| 408 | whatever name they choose. | ||
| 409 | |||
| 410 | * Why is OpenSSL x509 DN output not conformant to RFC2253? | ||
| 411 | |||
| 412 | The ways to print out the oneline format of the DN (Distinguished Name) have | ||
| 413 | been extended in version 0.9.7 of OpenSSL. Using the new X509_NAME_print_ex() | ||
| 414 | interface, the "-nameopt" option could be introduded. See the manual | ||
| 415 | page of the "openssl x509" commandline tool for details. The old behaviour | ||
| 416 | has however been left as default for the sake of compatibility. | ||
| 417 | |||
| 418 | * What is a "128 bit certificate"? Can I create one with OpenSSL? | ||
| 419 | |||
| 420 | The term "128 bit certificate" is a highly misleading marketing term. It does | ||
| 421 | *not* refer to the size of the public key in the certificate! A certificate | ||
| 422 | containing a 128 bit RSA key would have negligible security. | ||
| 423 | |||
| 424 | There were various other names such as "magic certificates", "SGC | ||
| 425 | certificates", "step up certificates" etc. | ||
| 426 | |||
| 427 | You can't generally create such a certificate using OpenSSL but there is no | ||
| 428 | need to any more. Nowadays web browsers using unrestricted strong encryption | ||
| 429 | are generally available. | ||
| 430 | |||
| 431 | When there were tight restrictions on the export of strong encryption | ||
| 432 | software from the US only weak encryption algorithms could be freely exported | ||
| 433 | (initially 40 bit and then 56 bit). It was widely recognised that this was | ||
| 434 | inadequate. A relaxation of the rules allowed the use of strong encryption but | ||
| 435 | only to an authorised server. | ||
| 436 | |||
| 437 | Two slighly different techniques were developed to support this, one used by | ||
| 438 | Netscape was called "step up", the other used by MSIE was called "Server Gated | ||
| 439 | Cryptography" (SGC). When a browser initially connected to a server it would | ||
| 440 | check to see if the certificate contained certain extensions and was issued by | ||
| 441 | an authorised authority. If these test succeeded it would reconnect using | ||
| 442 | strong encryption. | ||
| 443 | |||
| 444 | Only certain (initially one) certificate authorities could issue the | ||
| 445 | certificates and they generally cost more than ordinary certificates. | ||
| 446 | |||
| 447 | Although OpenSSL can create certificates containing the appropriate extensions | ||
| 448 | the certificate would not come from a permitted authority and so would not | ||
| 449 | be recognized. | ||
| 450 | |||
| 451 | The export laws were later changed to allow almost unrestricted use of strong | ||
| 452 | encryption so these certificates are now obsolete. | ||
| 453 | |||
| 454 | |||
| 455 | * Why does OpenSSL set the authority key identifier (AKID) extension incorrectly? | ||
| 456 | |||
| 457 | It doesn't: this extension is often the cause of confusion. | ||
| 458 | |||
| 459 | Consider a certificate chain A->B->C so that A signs B and B signs C. Suppose | ||
| 460 | certificate C contains AKID. | ||
| 461 | |||
| 462 | The purpose of this extension is to identify the authority certificate B. This | ||
| 463 | can be done either by including the subject key identifier of B or its issuer | ||
| 464 | name and serial number. | ||
| 465 | |||
| 466 | In this latter case because it is identifying certifcate B it must contain the | ||
| 467 | issuer name and serial number of B. | ||
| 468 | |||
| 469 | It is often wrongly assumed that it should contain the subject name of B. If it | ||
| 470 | did this would be redundant information because it would duplicate the issuer | ||
| 471 | name of C. | ||
| 472 | |||
| 473 | |||
| 474 | * How can I set up a bundle of commercial root CA certificates? | ||
| 475 | |||
| 476 | The OpenSSL software is shipped without any root CA certificate as the | ||
| 477 | OpenSSL project does not have any policy on including or excluding | ||
| 478 | any specific CA and does not intend to set up such a policy. Deciding | ||
| 479 | about which CAs to support is up to application developers or | ||
| 480 | administrators. | ||
| 481 | |||
| 482 | Other projects do have other policies so you can for example extract the CA | ||
| 483 | bundle used by Mozilla and/or modssl as described in this article: | ||
| 484 | |||
| 485 | <URL: http://www.mail-archive.com/modssl-users@modssl.org/msg16980.html> | ||
| 486 | |||
| 487 | |||
| 488 | [BUILD] ======================================================================= | ||
| 489 | |||
| 490 | * Why does the linker complain about undefined symbols? | ||
| 491 | |||
| 492 | Maybe the compilation was interrupted, and make doesn't notice that | ||
| 493 | something is missing. Run "make clean; make". | ||
| 494 | |||
| 495 | If you used ./Configure instead of ./config, make sure that you | ||
| 496 | selected the right target. File formats may differ slightly between | ||
| 497 | OS versions (for example sparcv8/sparcv9, or a.out/elf). | ||
| 498 | |||
| 499 | In case you get errors about the following symbols, use the config | ||
| 500 | option "no-asm", as described in INSTALL: | ||
| 501 | |||
| 502 | BF_cbc_encrypt, BF_decrypt, BF_encrypt, CAST_cbc_encrypt, | ||
| 503 | CAST_decrypt, CAST_encrypt, RC4, RC5_32_cbc_encrypt, RC5_32_decrypt, | ||
| 504 | RC5_32_encrypt, bn_add_words, bn_div_words, bn_mul_add_words, | ||
| 505 | bn_mul_comba4, bn_mul_comba8, bn_mul_words, bn_sqr_comba4, | ||
| 506 | bn_sqr_comba8, bn_sqr_words, bn_sub_words, des_decrypt3, | ||
| 507 | des_ede3_cbc_encrypt, des_encrypt, des_encrypt2, des_encrypt3, | ||
| 508 | des_ncbc_encrypt, md5_block_asm_host_order, sha1_block_asm_data_order | ||
| 509 | |||
| 510 | If none of these helps, you may want to try using the current snapshot. | ||
| 511 | If the problem persists, please submit a bug report. | ||
| 512 | |||
| 513 | |||
| 514 | * Why does the OpenSSL test fail with "bc: command not found"? | ||
| 515 | |||
| 516 | You didn't install "bc", the Unix calculator. If you want to run the | ||
| 517 | tests, get GNU bc from ftp://ftp.gnu.org or from your OS distributor. | ||
| 518 | |||
| 519 | |||
| 520 | * Why does the OpenSSL test fail with "bc: 1 no implemented"? | ||
| 521 | |||
| 522 | On some SCO installations or versions, bc has a bug that gets triggered | ||
| 523 | when you run the test suite (using "make test"). The message returned is | ||
| 524 | "bc: 1 not implemented". | ||
| 525 | |||
| 526 | The best way to deal with this is to find another implementation of bc | ||
| 527 | and compile/install it. GNU bc (see <URL: http://www.gnu.org/software/software.html> | ||
| 528 | for download instructions) can be safely used, for example. | ||
| 529 | |||
| 530 | |||
| 531 | * Why does the OpenSSL test fail with "bc: stack empty"? | ||
| 532 | |||
| 533 | On some DG/ux versions, bc seems to have a too small stack for calculations | ||
| 534 | that the OpenSSL bntest throws at it. This gets triggered when you run the | ||
| 535 | test suite (using "make test"). The message returned is "bc: stack empty". | ||
| 536 | |||
| 537 | The best way to deal with this is to find another implementation of bc | ||
| 538 | and compile/install it. GNU bc (see <URL: http://www.gnu.org/software/software.html> | ||
| 539 | for download instructions) can be safely used, for example. | ||
| 540 | |||
| 541 | |||
| 542 | * Why does the OpenSSL compilation fail on Alpha Tru64 Unix? | ||
| 543 | |||
| 544 | On some Alpha installations running Tru64 Unix and Compaq C, the compilation | ||
| 545 | of crypto/sha/sha_dgst.c fails with the message 'Fatal: Insufficient virtual | ||
| 546 | memory to continue compilation.' As far as the tests have shown, this may be | ||
| 547 | a compiler bug. What happens is that it eats up a lot of resident memory | ||
| 548 | to build something, probably a table. The problem is clearly in the | ||
| 549 | optimization code, because if one eliminates optimization completely (-O0), | ||
| 550 | the compilation goes through (and the compiler consumes about 2MB of resident | ||
| 551 | memory instead of 240MB or whatever one's limit is currently). | ||
| 552 | |||
| 553 | There are three options to solve this problem: | ||
| 554 | |||
| 555 | 1. set your current data segment size soft limit higher. Experience shows | ||
| 556 | that about 241000 kbytes seems to be enough on an AlphaServer DS10. You do | ||
| 557 | this with the command 'ulimit -Sd nnnnnn', where 'nnnnnn' is the number of | ||
| 558 | kbytes to set the limit to. | ||
| 559 | |||
| 560 | 2. If you have a hard limit that is lower than what you need and you can't | ||
| 561 | get it changed, you can compile all of OpenSSL with -O0 as optimization | ||
| 562 | level. This is however not a very nice thing to do for those who expect to | ||
| 563 | get the best result from OpenSSL. A bit more complicated solution is the | ||
| 564 | following: | ||
| 565 | |||
| 566 | ----- snip:start ----- | ||
| 567 | make DIRS=crypto SDIRS=sha "`grep '^CFLAG=' Makefile.ssl | \ | ||
| 568 | sed -e 's/ -O[0-9] / -O0 /'`" | ||
| 569 | rm `ls crypto/*.o crypto/sha/*.o | grep -v 'sha_dgst\.o'` | ||
| 570 | make | ||
| 571 | ----- snip:end ----- | ||
| 572 | |||
| 573 | This will only compile sha_dgst.c with -O0, the rest with the optimization | ||
| 574 | level chosen by the configuration process. When the above is done, do the | ||
| 575 | test and installation and you're set. | ||
| 576 | |||
| 577 | 3. Reconfigure the toolkit with no-sha0 option to leave out SHA0. It | ||
| 578 | should not be used and is not used in SSL/TLS nor any other recognized | ||
| 579 | protocol in either case. | ||
| 580 | |||
| 581 | |||
| 582 | * Why does the OpenSSL compilation fail with "ar: command not found"? | ||
| 583 | |||
| 584 | Getting this message is quite usual on Solaris 2, because Sun has hidden | ||
| 585 | away 'ar' and other development commands in directories that aren't in | ||
| 586 | $PATH by default. One of those directories is '/usr/ccs/bin'. The | ||
| 587 | quickest way to fix this is to do the following (it assumes you use sh | ||
| 588 | or any sh-compatible shell): | ||
| 589 | |||
| 590 | ----- snip:start ----- | ||
| 591 | PATH=${PATH}:/usr/ccs/bin; export PATH | ||
| 592 | ----- snip:end ----- | ||
| 593 | |||
| 594 | and then redo the compilation. What you should really do is make sure | ||
| 595 | '/usr/ccs/bin' is permanently in your $PATH, for example through your | ||
| 596 | '.profile' (again, assuming you use a sh-compatible shell). | ||
| 597 | |||
| 598 | |||
| 599 | * Why does the OpenSSL compilation fail on Win32 with VC++? | ||
| 600 | |||
| 601 | Sometimes, you may get reports from VC++ command line (cl) that it | ||
| 602 | can't find standard include files like stdio.h and other weirdnesses. | ||
| 603 | One possible cause is that the environment isn't correctly set up. | ||
| 604 | To solve that problem for VC++ versions up to 6, one should run | ||
| 605 | VCVARS32.BAT which is found in the 'bin' subdirectory of the VC++ | ||
| 606 | installation directory (somewhere under 'Program Files'). For VC++ | ||
| 607 | version 7 (and up?), which is also called VS.NET, the file is called | ||
| 608 | VSVARS32.BAT instead. | ||
| 609 | This needs to be done prior to running NMAKE, and the changes are only | ||
| 610 | valid for the current DOS session. | ||
| 611 | |||
| 612 | |||
| 613 | * What is special about OpenSSL on Redhat? | ||
| 614 | |||
| 615 | Red Hat Linux (release 7.0 and later) include a preinstalled limited | ||
| 616 | version of OpenSSL. For patent reasons, support for IDEA, RC5 and MDC2 | ||
| 617 | is disabled in this version. The same may apply to other Linux distributions. | ||
| 618 | Users may therefore wish to install more or all of the features left out. | ||
| 619 | |||
| 620 | To do this you MUST ensure that you do not overwrite the openssl that is in | ||
| 621 | /usr/bin on your Red Hat machine. Several packages depend on this file, | ||
| 622 | including sendmail and ssh. /usr/local/bin is a good alternative choice. The | ||
| 623 | libraries that come with Red Hat 7.0 onwards have different names and so are | ||
| 624 | not affected. (eg For Red Hat 7.2 they are /lib/libssl.so.0.9.6b and | ||
| 625 | /lib/libcrypto.so.0.9.6b with symlinks /lib/libssl.so.2 and | ||
| 626 | /lib/libcrypto.so.2 respectively). | ||
| 627 | |||
| 628 | Please note that we have been advised by Red Hat attempting to recompile the | ||
| 629 | openssl rpm with all the cryptography enabled will not work. All other | ||
| 630 | packages depend on the original Red Hat supplied openssl package. It is also | ||
| 631 | worth noting that due to the way Red Hat supplies its packages, updates to | ||
| 632 | openssl on each distribution never change the package version, only the | ||
| 633 | build number. For example, on Red Hat 7.1, the latest openssl package has | ||
| 634 | version number 0.9.6 and build number 9 even though it contains all the | ||
| 635 | relevant updates in packages up to and including 0.9.6b. | ||
| 636 | |||
| 637 | A possible way around this is to persuade Red Hat to produce a non-US | ||
| 638 | version of Red Hat Linux. | ||
| 639 | |||
| 640 | FYI: Patent numbers and expiry dates of US patents: | ||
| 641 | MDC-2: 4,908,861 13/03/2007 | ||
| 642 | IDEA: 5,214,703 25/05/2010 | ||
| 643 | RC5: 5,724,428 03/03/2015 | ||
| 644 | |||
| 645 | |||
| 646 | * Why does the OpenSSL compilation fail on MacOS X? | ||
| 647 | |||
| 648 | If the failure happens when trying to build the "openssl" binary, with | ||
| 649 | a large number of undefined symbols, it's very probable that you have | ||
| 650 | OpenSSL 0.9.6b delivered with the operating system (you can find out by | ||
| 651 | running '/usr/bin/openssl version') and that you were trying to build | ||
| 652 | OpenSSL 0.9.7 or newer. The problem is that the loader ('ld') in | ||
| 653 | MacOS X has a misfeature that's quite difficult to go around. | ||
| 654 | Look in the file PROBLEMS for a more detailed explanation and for possible | ||
| 655 | solutions. | ||
| 656 | |||
| 657 | |||
| 658 | * Why does the OpenSSL test suite fail on MacOS X? | ||
| 659 | |||
| 660 | If the failure happens when running 'make test' and the RC4 test fails, | ||
| 661 | it's very probable that you have OpenSSL 0.9.6b delivered with the | ||
| 662 | operating system (you can find out by running '/usr/bin/openssl version') | ||
| 663 | and that you were trying to build OpenSSL 0.9.6d. The problem is that | ||
| 664 | the loader ('ld') in MacOS X has a misfeature that's quite difficult to | ||
| 665 | go around and has linked the programs "openssl" and the test programs | ||
| 666 | with /usr/lib/libcrypto.dylib and /usr/lib/libssl.dylib instead of the | ||
| 667 | libraries you just built. | ||
| 668 | Look in the file PROBLEMS for a more detailed explanation and for possible | ||
| 669 | solutions. | ||
| 670 | |||
| 671 | * Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]? | ||
| 672 | |||
| 673 | Failure in BN_sqr test is most likely caused by a failure to configure the | ||
| 674 | toolkit for current platform or lack of support for the platform in question. | ||
| 675 | Run './config -t' and './apps/openssl version -p'. Do these platform | ||
| 676 | identifiers match? If they don't, then you most likely failed to run | ||
| 677 | ./config and you're hereby advised to do so before filing a bug report. | ||
| 678 | If ./config itself fails to run, then it's most likely problem with your | ||
| 679 | local environment and you should turn to your system administrator (or | ||
| 680 | similar). If identifiers match (and/or no alternative identifier is | ||
| 681 | suggested by ./config script), then the platform is unsupported. There might | ||
| 682 | or might not be a workaround. Most notably on SPARC64 platforms with GNU | ||
| 683 | C compiler you should be able to produce a working build by running | ||
| 684 | './config -m32'. I understand that -m32 might not be what you want/need, | ||
| 685 | but the build should be operational. For further details turn to | ||
| 686 | <openssl-dev@openssl.org>. | ||
| 687 | |||
| 688 | * Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"? | ||
| 689 | |||
| 690 | As of 0.9.7 assembler routines were overhauled for position independence | ||
| 691 | of the machine code, which is essential for shared library support. For | ||
| 692 | some reason OpenBSD is equipped with an out-of-date GNU assembler which | ||
| 693 | finds the new code offensive. To work around the problem, configure with | ||
| 694 | no-asm (and sacrifice a great deal of performance) or patch your assembler | ||
| 695 | according to <URL: http://www.openssl.org/~appro/gas-1.92.3.OpenBSD.patch>. | ||
| 696 | For your convenience a pre-compiled replacement binary is provided at | ||
| 697 | <URL: http://www.openssl.org/~appro/gas-1.92.3.static.aout.bin>. | ||
| 698 | Reportedly elder *BSD a.out platforms also suffer from this problem and | ||
| 699 | remedy should be same. Provided binary is statically linked and should be | ||
| 700 | working across wider range of *BSD branches, not just OpenBSD. | ||
| 701 | |||
| 702 | * Why does the OpenSSL test suite fail in sha512t on x86 CPU? | ||
| 703 | |||
| 704 | If the test program in question fails withs SIGILL, Illegal Instruction | ||
| 705 | exception, then you more than likely to run SSE2-capable CPU, such as | ||
| 706 | Intel P4, under control of kernel which does not support SSE2 | ||
| 707 | instruction extentions. See accompanying INSTALL file and | ||
| 708 | OPENSSL_ia32cap(3) documentation page for further information. | ||
| 709 | |||
| 710 | * Why does compiler fail to compile sha512.c? | ||
| 711 | |||
| 712 | OpenSSL SHA-512 implementation depends on compiler support for 64-bit | ||
| 713 | integer type. Few elder compilers [ULTRIX cc, SCO compiler to mention a | ||
| 714 | couple] lack support for this and therefore are incapable of compiling | ||
| 715 | the module in question. The recommendation is to disable SHA-512 by | ||
| 716 | adding no-sha512 to ./config [or ./Configure] command line. Another | ||
| 717 | possible alternative might be to switch to GCC. | ||
| 718 | |||
| 719 | * Test suite still fails, what to do? | ||
| 720 | |||
| 721 | Another common reason for failure to complete some particular test is | ||
| 722 | simply bad code generated by a buggy component in toolchain or deficiency | ||
| 723 | in run-time environment. There are few cases documented in PROBLEMS file, | ||
| 724 | consult it for possible workaround before you beat the drum. Even if you | ||
| 725 | don't find solution or even mention there, do reserve for possibility of | ||
| 726 | a compiler bug. Compiler bugs might appear in rather bizarre ways, they | ||
| 727 | never make sense, and tend to emerge when you least expect them. In order | ||
| 728 | to identify one, drop optimization level, e.g. by editing CFLAG line in | ||
| 729 | top-level Makefile, recompile and re-run the test. | ||
| 730 | |||
| 731 | * I think I've found a bug, what should I do? | ||
| 732 | |||
| 733 | If you are a new user then it is quite likely you haven't found a bug and | ||
| 734 | something is happening you aren't familiar with. Check this FAQ, the associated | ||
| 735 | documentation and the mailing lists for similar queries. If you are still | ||
| 736 | unsure whether it is a bug or not submit a query to the openssl-users mailing | ||
| 737 | list. | ||
| 738 | |||
| 739 | |||
| 740 | * I'm SURE I've found a bug, how do I report it? | ||
| 741 | |||
| 742 | Bug reports with no security implications should be sent to the request | ||
| 743 | tracker. This can be done by mailing the report to <rt@openssl.org> (or its | ||
| 744 | alias <openssl-bugs@openssl.org>), please note that messages sent to the | ||
| 745 | request tracker also appear in the public openssl-dev mailing list. | ||
| 746 | |||
| 747 | The report should be in plain text. Any patches should be sent as | ||
| 748 | plain text attachments because some mailers corrupt patches sent inline. | ||
| 749 | If your issue affects multiple versions of OpenSSL check any patches apply | ||
| 750 | cleanly and, if possible include patches to each affected version. | ||
| 751 | |||
| 752 | The report should be given a meaningful subject line briefly summarising the | ||
| 753 | issue. Just "bug in OpenSSL" or "bug in OpenSSL 0.9.8n" is not very helpful. | ||
| 754 | |||
| 755 | By sending reports to the request tracker the bug can then be given a priority | ||
| 756 | and assigned to the appropriate maintainer. The history of discussions can be | ||
| 757 | accessed and if the issue has been addressed or a reason why not. If patches | ||
| 758 | are only sent to openssl-dev they can be mislaid if a team member has to | ||
| 759 | wade through months of old messages to review the discussion. | ||
| 760 | |||
| 761 | See also <URL: http://www.openssl.org/support/rt.html> | ||
| 762 | |||
| 763 | |||
| 764 | * I've found a security issue, how do I report it? | ||
| 765 | |||
| 766 | If you think your bug has security implications then please send it to | ||
| 767 | openssl-security@openssl.org if you don't get a prompt reply at least | ||
| 768 | acknowledging receipt then resend or mail it directly to one of the | ||
| 769 | more active team members (e.g. Steve). | ||
| 770 | |||
| 771 | Note that bugs only present in the openssl utility are not in general | ||
| 772 | considered to be security issues. | ||
| 773 | |||
| 774 | [PROG] ======================================================================== | ||
| 775 | |||
| 776 | * Is OpenSSL thread-safe? | ||
| 777 | |||
| 778 | Yes (with limitations: an SSL connection may not concurrently be used | ||
| 779 | by multiple threads). On Windows and many Unix systems, OpenSSL | ||
| 780 | automatically uses the multi-threaded versions of the standard | ||
| 781 | libraries. If your platform is not one of these, consult the INSTALL | ||
| 782 | file. | ||
| 783 | |||
| 784 | Multi-threaded applications must provide two callback functions to | ||
| 785 | OpenSSL by calling CRYPTO_set_locking_callback() and | ||
| 786 | CRYPTO_set_id_callback(), for all versions of OpenSSL up to and | ||
| 787 | including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback() | ||
| 788 | and associated APIs are deprecated by CRYPTO_THREADID_set_callback() | ||
| 789 | and friends. This is described in the threads(3) manpage. | ||
| 790 | |||
| 791 | * I've compiled a program under Windows and it crashes: why? | ||
| 792 | |||
| 793 | This is usually because you've missed the comment in INSTALL.W32. | ||
| 794 | Your application must link against the same version of the Win32 | ||
| 795 | C-Runtime against which your openssl libraries were linked. The | ||
| 796 | default version for OpenSSL is /MD - "Multithreaded DLL". | ||
| 797 | |||
| 798 | If you are using Microsoft Visual C++'s IDE (Visual Studio), in | ||
| 799 | many cases, your new project most likely defaulted to "Debug | ||
| 800 | Singlethreaded" - /ML. This is NOT interchangeable with /MD and your | ||
| 801 | program will crash, typically on the first BIO related read or write | ||
| 802 | operation. | ||
| 803 | |||
| 804 | For each of the six possible link stage configurations within Win32, | ||
| 805 | your application must link against the same by which OpenSSL was | ||
| 806 | built. If you are using MS Visual C++ (Studio) this can be changed | ||
| 807 | by: | ||
| 808 | |||
| 809 | 1. Select Settings... from the Project Menu. | ||
| 810 | 2. Select the C/C++ Tab. | ||
| 811 | 3. Select "Code Generation from the "Category" drop down list box | ||
| 812 | 4. Select the Appropriate library (see table below) from the "Use | ||
| 813 | run-time library" drop down list box. Perform this step for both | ||
| 814 | your debug and release versions of your application (look at the | ||
| 815 | top left of the settings panel to change between the two) | ||
| 816 | |||
| 817 | Single Threaded /ML - MS VC++ often defaults to | ||
| 818 | this for the release | ||
| 819 | version of a new project. | ||
| 820 | Debug Single Threaded /MLd - MS VC++ often defaults to | ||
| 821 | this for the debug version | ||
| 822 | of a new project. | ||
| 823 | Multithreaded /MT | ||
| 824 | Debug Multithreaded /MTd | ||
| 825 | Multithreaded DLL /MD - OpenSSL defaults to this. | ||
| 826 | Debug Multithreaded DLL /MDd | ||
| 827 | |||
| 828 | Note that debug and release libraries are NOT interchangeable. If you | ||
| 829 | built OpenSSL with /MD your application must use /MD and cannot use /MDd. | ||
| 830 | |||
| 831 | As per 0.9.8 the above limitation is eliminated for .DLLs. OpenSSL | ||
| 832 | .DLLs compiled with some specific run-time option [we insist on the | ||
| 833 | default /MD] can be deployed with application compiled with different | ||
| 834 | option or even different compiler. But there is a catch! Instead of | ||
| 835 | re-compiling OpenSSL toolkit, as you would have to with prior versions, | ||
| 836 | you have to compile small C snippet with compiler and/or options of | ||
| 837 | your choice. The snippet gets installed as | ||
| 838 | <install-root>/include/openssl/applink.c and should be either added to | ||
| 839 | your application project or simply #include-d in one [and only one] | ||
| 840 | of your application source files. Failure to link this shim module | ||
| 841 | into your application manifests itself as fatal "no OPENSSL_Applink" | ||
| 842 | run-time error. An explicit reminder is due that in this situation | ||
| 843 | [mixing compiler options] it is as important to add CRYPTO_malloc_init | ||
| 844 | prior first call to OpenSSL. | ||
| 845 | |||
| 846 | * How do I read or write a DER encoded buffer using the ASN1 functions? | ||
| 847 | |||
| 848 | You have two options. You can either use a memory BIO in conjunction | ||
| 849 | with the i2d_*_bio() or d2i_*_bio() functions or you can use the | ||
| 850 | i2d_*(), d2i_*() functions directly. Since these are often the | ||
| 851 | cause of grief here are some code fragments using PKCS7 as an example: | ||
| 852 | |||
| 853 | unsigned char *buf, *p; | ||
| 854 | int len; | ||
| 855 | |||
| 856 | len = i2d_PKCS7(p7, NULL); | ||
| 857 | buf = OPENSSL_malloc(len); /* or Malloc, error checking omitted */ | ||
| 858 | p = buf; | ||
| 859 | i2d_PKCS7(p7, &p); | ||
| 860 | |||
| 861 | At this point buf contains the len bytes of the DER encoding of | ||
| 862 | p7. | ||
| 863 | |||
| 864 | The opposite assumes we already have len bytes in buf: | ||
| 865 | |||
| 866 | unsigned char *p; | ||
| 867 | p = buf; | ||
| 868 | p7 = d2i_PKCS7(NULL, &p, len); | ||
| 869 | |||
| 870 | At this point p7 contains a valid PKCS7 structure of NULL if an error | ||
| 871 | occurred. If an error occurred ERR_print_errors(bio) should give more | ||
| 872 | information. | ||
| 873 | |||
| 874 | The reason for the temporary variable 'p' is that the ASN1 functions | ||
| 875 | increment the passed pointer so it is ready to read or write the next | ||
| 876 | structure. This is often a cause of problems: without the temporary | ||
| 877 | variable the buffer pointer is changed to point just after the data | ||
| 878 | that has been read or written. This may well be uninitialized data | ||
| 879 | and attempts to free the buffer will have unpredictable results | ||
| 880 | because it no longer points to the same address. | ||
| 881 | |||
| 882 | |||
| 883 | * OpenSSL uses DER but I need BER format: does OpenSSL support BER? | ||
| 884 | |||
| 885 | The short answer is yes, because DER is a special case of BER and OpenSSL | ||
| 886 | ASN1 decoders can process BER. | ||
| 887 | |||
| 888 | The longer answer is that ASN1 structures can be encoded in a number of | ||
| 889 | different ways. One set of ways is the Basic Encoding Rules (BER) with various | ||
| 890 | permissible encodings. A restriction of BER is the Distinguished Encoding | ||
| 891 | Rules (DER): these uniquely specify how a given structure is encoded. | ||
| 892 | |||
| 893 | Therefore, because DER is a special case of BER, DER is an acceptable encoding | ||
| 894 | for BER. | ||
| 895 | |||
| 896 | |||
| 897 | * I've tried using <M_some_evil_pkcs12_macro> and I get errors why? | ||
| 898 | |||
| 899 | This usually happens when you try compiling something using the PKCS#12 | ||
| 900 | macros with a C++ compiler. There is hardly ever any need to use the | ||
| 901 | PKCS#12 macros in a program, it is much easier to parse and create | ||
| 902 | PKCS#12 files using the PKCS12_parse() and PKCS12_create() functions | ||
| 903 | documented in doc/openssl.txt and with examples in demos/pkcs12. The | ||
| 904 | 'pkcs12' application has to use the macros because it prints out | ||
| 905 | debugging information. | ||
| 906 | |||
| 907 | |||
| 908 | * I've called <some function> and it fails, why? | ||
| 909 | |||
| 910 | Before submitting a report or asking in one of the mailing lists, you | ||
| 911 | should try to determine the cause. In particular, you should call | ||
| 912 | ERR_print_errors() or ERR_print_errors_fp() after the failed call | ||
| 913 | and see if the message helps. Note that the problem may occur earlier | ||
| 914 | than you think -- you should check for errors after every call where | ||
| 915 | it is possible, otherwise the actual problem may be hidden because | ||
| 916 | some OpenSSL functions clear the error state. | ||
| 917 | |||
| 918 | |||
| 919 | * I just get a load of numbers for the error output, what do they mean? | ||
| 920 | |||
| 921 | The actual format is described in the ERR_print_errors() manual page. | ||
| 922 | You should call the function ERR_load_crypto_strings() before hand and | ||
| 923 | the message will be output in text form. If you can't do this (for example | ||
| 924 | it is a pre-compiled binary) you can use the errstr utility on the error | ||
| 925 | code itself (the hex digits after the second colon). | ||
| 926 | |||
| 927 | |||
| 928 | * Why do I get errors about unknown algorithms? | ||
| 929 | |||
| 930 | The cause is forgetting to load OpenSSL's table of algorithms with | ||
| 931 | OpenSSL_add_all_algorithms(). See the manual page for more information. This | ||
| 932 | can cause several problems such as being unable to read in an encrypted | ||
| 933 | PEM file, unable to decrypt a PKCS#12 file or signature failure when | ||
| 934 | verifying certificates. | ||
| 935 | |||
| 936 | * Why can't the OpenSSH configure script detect OpenSSL? | ||
| 937 | |||
| 938 | Several reasons for problems with the automatic detection exist. | ||
| 939 | OpenSSH requires at least version 0.9.5a of the OpenSSL libraries. | ||
| 940 | Sometimes the distribution has installed an older version in the system | ||
| 941 | locations that is detected instead of a new one installed. The OpenSSL | ||
| 942 | library might have been compiled for another CPU or another mode (32/64 bits). | ||
| 943 | Permissions might be wrong. | ||
| 944 | |||
| 945 | The general answer is to check the config.log file generated when running | ||
| 946 | the OpenSSH configure script. It should contain the detailed information | ||
| 947 | on why the OpenSSL library was not detected or considered incompatible. | ||
| 948 | |||
| 949 | |||
| 950 | * Can I use OpenSSL's SSL library with non-blocking I/O? | ||
| 951 | |||
| 952 | Yes; make sure to read the SSL_get_error(3) manual page! | ||
| 953 | |||
| 954 | A pitfall to avoid: Don't assume that SSL_read() will just read from | ||
| 955 | the underlying transport or that SSL_write() will just write to it -- | ||
| 956 | it is also possible that SSL_write() cannot do any useful work until | ||
| 957 | there is data to read, or that SSL_read() cannot do anything until it | ||
| 958 | is possible to send data. One reason for this is that the peer may | ||
| 959 | request a new TLS/SSL handshake at any time during the protocol, | ||
| 960 | requiring a bi-directional message exchange; both SSL_read() and | ||
| 961 | SSL_write() will try to continue any pending handshake. | ||
| 962 | |||
| 963 | |||
| 964 | * Why doesn't my server application receive a client certificate? | ||
| 965 | |||
| 966 | Due to the TLS protocol definition, a client will only send a certificate, | ||
| 967 | if explicitly asked by the server. Use the SSL_VERIFY_PEER flag of the | ||
| 968 | SSL_CTX_set_verify() function to enable the use of client certificates. | ||
| 969 | |||
| 970 | |||
| 971 | * Why does compilation fail due to an undefined symbol NID_uniqueIdentifier? | ||
| 972 | |||
| 973 | For OpenSSL 0.9.7 the OID table was extended and corrected. In earlier | ||
| 974 | versions, uniqueIdentifier was incorrectly used for X.509 certificates. | ||
| 975 | The correct name according to RFC2256 (LDAP) is x500UniqueIdentifier. | ||
| 976 | Change your code to use the new name when compiling against OpenSSL 0.9.7. | ||
| 977 | |||
| 978 | |||
| 979 | * I think I've detected a memory leak, is this a bug? | ||
| 980 | |||
| 981 | In most cases the cause of an apparent memory leak is an OpenSSL internal table | ||
| 982 | that is allocated when an application starts up. Since such tables do not grow | ||
| 983 | in size over time they are harmless. | ||
| 984 | |||
| 985 | These internal tables can be freed up when an application closes using various | ||
| 986 | functions. Currently these include following: | ||
| 987 | |||
| 988 | Thread-local cleanup functions: | ||
| 989 | |||
| 990 | ERR_remove_state() | ||
| 991 | |||
| 992 | Application-global cleanup functions that are aware of usage (and therefore | ||
| 993 | thread-safe): | ||
| 994 | |||
| 995 | ENGINE_cleanup() and CONF_modules_unload() | ||
| 996 | |||
| 997 | "Brutal" (thread-unsafe) Application-global cleanup functions: | ||
| 998 | |||
| 999 | ERR_free_strings(), EVP_cleanup() and CRYPTO_cleanup_all_ex_data(). | ||
| 1000 | |||
| 1001 | |||
| 1002 | * Why does Valgrind complain about the use of uninitialized data? | ||
| 1003 | |||
| 1004 | When OpenSSL's PRNG routines are called to generate random numbers the supplied | ||
| 1005 | buffer contents are mixed into the entropy pool: so it technically does not | ||
| 1006 | matter whether the buffer is initialized at this point or not. Valgrind (and | ||
| 1007 | other test tools) will complain about this. When using Valgrind, make sure the | ||
| 1008 | OpenSSL library has been compiled with the PURIFY macro defined (-DPURIFY) | ||
| 1009 | to get rid of these warnings. | ||
| 1010 | |||
| 1011 | |||
| 1012 | * Why doesn't a memory BIO work when a file does? | ||
| 1013 | |||
| 1014 | This can occur in several cases for example reading an S/MIME email message. | ||
| 1015 | The reason is that a memory BIO can do one of two things when all the data | ||
| 1016 | has been read from it. | ||
| 1017 | |||
| 1018 | The default behaviour is to indicate that no more data is available and that | ||
| 1019 | the call should be retried, this is to allow the application to fill up the BIO | ||
| 1020 | again if necessary. | ||
| 1021 | |||
| 1022 | Alternatively it can indicate that no more data is available and that EOF has | ||
| 1023 | been reached. | ||
| 1024 | |||
| 1025 | If a memory BIO is to behave in the same way as a file this second behaviour | ||
| 1026 | is needed. This must be done by calling: | ||
| 1027 | |||
| 1028 | BIO_set_mem_eof_return(bio, 0); | ||
| 1029 | |||
| 1030 | See the manual pages for more details. | ||
| 1031 | |||
| 1032 | |||
| 1033 | * Where are the declarations and implementations of d2i_X509() etc? | ||
| 1034 | |||
| 1035 | These are defined and implemented by macros of the form: | ||
| 1036 | |||
| 1037 | |||
| 1038 | DECLARE_ASN1_FUNCTIONS(X509) and IMPLEMENT_ASN1_FUNCTIONS(X509) | ||
| 1039 | |||
| 1040 | The implementation passes an ASN1 "template" defining the structure into an | ||
| 1041 | ASN1 interpreter using generalised functions such as ASN1_item_d2i(). | ||
| 1042 | |||
| 1043 | |||
| 1044 | =============================================================================== | ||
diff --git a/src/lib/libssl/src/INSTALL b/src/lib/libssl/src/INSTALL deleted file mode 100644 index bd37bf52d2..0000000000 --- a/src/lib/libssl/src/INSTALL +++ /dev/null | |||
| @@ -1,353 +0,0 @@ | |||
| 1 | |||
| 2 | INSTALLATION ON THE UNIX PLATFORM | ||
| 3 | --------------------------------- | ||
| 4 | |||
| 5 | To install OpenSSL, you will need: | ||
| 6 | |||
| 7 | * make | ||
| 8 | * Perl 5 | ||
| 9 | * an ANSI C compiler | ||
| 10 | * a development environment in form of development libraries and C | ||
| 11 | header files | ||
| 12 | * a supported Unix operating system | ||
| 13 | |||
| 14 | Quick Start | ||
| 15 | ----------- | ||
| 16 | |||
| 17 | If you want to just get on with it, do: | ||
| 18 | |||
| 19 | $ ./config | ||
| 20 | $ make | ||
| 21 | $ make test | ||
| 22 | $ make install | ||
| 23 | |||
| 24 | [If any of these steps fails, see section Installation in Detail below.] | ||
| 25 | |||
| 26 | This will build and install OpenSSL in the default location, which is (for | ||
| 27 | historical reasons) /usr/local/ssl. If you want to install it anywhere else, | ||
| 28 | run config like this: | ||
| 29 | |||
| 30 | $ ./config --prefix=/usr/local --openssldir=/usr/local/openssl | ||
| 31 | |||
| 32 | |||
| 33 | Configuration Options | ||
| 34 | --------------------- | ||
| 35 | |||
| 36 | There are several options to ./config (or ./Configure) to customize | ||
| 37 | the build: | ||
| 38 | |||
| 39 | --prefix=DIR Install in DIR/bin, DIR/lib, DIR/include/openssl. | ||
| 40 | Configuration files used by OpenSSL will be in DIR/ssl | ||
| 41 | or the directory specified by --openssldir. | ||
| 42 | |||
| 43 | --openssldir=DIR Directory for OpenSSL files. If no prefix is specified, | ||
| 44 | the library files and binaries are also installed there. | ||
| 45 | |||
| 46 | no-threads Don't try to build with support for multi-threaded | ||
| 47 | applications. | ||
| 48 | |||
| 49 | threads Build with support for multi-threaded applications. | ||
| 50 | This will usually require additional system-dependent options! | ||
| 51 | See "Note on multi-threading" below. | ||
| 52 | |||
| 53 | no-zlib Don't try to build with support for zlib compression and | ||
| 54 | decompression. | ||
| 55 | |||
| 56 | zlib Build with support for zlib compression/decompression. | ||
| 57 | |||
| 58 | zlib-dynamic Like "zlib", but has OpenSSL load the zlib library dynamically | ||
| 59 | when needed. This is only supported on systems where loading | ||
| 60 | of shared libraries is supported. This is the default choice. | ||
| 61 | |||
| 62 | no-shared Don't try to create shared libraries. | ||
| 63 | |||
| 64 | shared In addition to the usual static libraries, create shared | ||
| 65 | libraries on platforms where it's supported. See "Note on | ||
| 66 | shared libraries" below. | ||
| 67 | |||
| 68 | no-asm Do not use assembler code. | ||
| 69 | |||
| 70 | 386 Use the 80386 instruction set only (the default x86 code is | ||
| 71 | more efficient, but requires at least a 486). Note: Use | ||
| 72 | compiler flags for any other CPU specific configuration, | ||
| 73 | e.g. "-m32" to build x86 code on an x64 system. | ||
| 74 | |||
| 75 | no-sse2 Exclude SSE2 code pathes. Normally SSE2 extention is | ||
| 76 | detected at run-time, but the decision whether or not the | ||
| 77 | machine code will be executed is taken solely on CPU | ||
| 78 | capability vector. This means that if you happen to run OS | ||
| 79 | kernel which does not support SSE2 extension on Intel P4 | ||
| 80 | processor, then your application might be exposed to | ||
| 81 | "illegal instruction" exception. There might be a way | ||
| 82 | to enable support in kernel, e.g. FreeBSD kernel can be | ||
| 83 | compiled with CPU_ENABLE_SSE, and there is a way to | ||
| 84 | disengage SSE2 code pathes upon application start-up, | ||
| 85 | but if you aim for wider "audience" running such kernel, | ||
| 86 | consider no-sse2. Both 386 and no-asm options above imply | ||
| 87 | no-sse2. | ||
| 88 | |||
| 89 | no-<cipher> Build without the specified cipher (bf, cast, des, dh, dsa, | ||
| 90 | hmac, md2, md5, mdc2, rc2, rc4, rc5, rsa, sha). | ||
| 91 | The crypto/<cipher> directory can be removed after running | ||
| 92 | "make depend". | ||
| 93 | |||
| 94 | -Dxxx, -lxxx, -Lxxx, -fxxx, -mXXX, -Kxxx These system specific options will | ||
| 95 | be passed through to the compiler to allow you to | ||
| 96 | define preprocessor symbols, specify additional libraries, | ||
| 97 | library directories or other compiler options. | ||
| 98 | |||
| 99 | -DHAVE_CRYPTODEV Enable the BSD cryptodev engine even if we are not using | ||
| 100 | BSD. Useful if you are running ocf-linux or something | ||
| 101 | similar. Once enabled you can also enable the use of | ||
| 102 | cryptodev digests, which is usually slower unless you have | ||
| 103 | large amounts data. Use -DUSE_CRYPTODEV_DIGESTS to force | ||
| 104 | it. | ||
| 105 | |||
| 106 | Installation in Detail | ||
| 107 | ---------------------- | ||
| 108 | |||
| 109 | 1a. Configure OpenSSL for your operation system automatically: | ||
| 110 | |||
| 111 | $ ./config [options] | ||
| 112 | |||
| 113 | This guesses at your operating system (and compiler, if necessary) and | ||
| 114 | configures OpenSSL based on this guess. Run ./config -t to see | ||
| 115 | if it guessed correctly. If you want to use a different compiler, you | ||
| 116 | are cross-compiling for another platform, or the ./config guess was | ||
| 117 | wrong for other reasons, go to step 1b. Otherwise go to step 2. | ||
| 118 | |||
| 119 | On some systems, you can include debugging information as follows: | ||
| 120 | |||
| 121 | $ ./config -d [options] | ||
| 122 | |||
| 123 | 1b. Configure OpenSSL for your operating system manually | ||
| 124 | |||
| 125 | OpenSSL knows about a range of different operating system, hardware and | ||
| 126 | compiler combinations. To see the ones it knows about, run | ||
| 127 | |||
| 128 | $ ./Configure | ||
| 129 | |||
| 130 | Pick a suitable name from the list that matches your system. For most | ||
| 131 | operating systems there is a choice between using "cc" or "gcc". When | ||
| 132 | you have identified your system (and if necessary compiler) use this name | ||
| 133 | as the argument to ./Configure. For example, a "linux-elf" user would | ||
| 134 | run: | ||
| 135 | |||
| 136 | $ ./Configure linux-elf [options] | ||
| 137 | |||
| 138 | If your system is not available, you will have to edit the Configure | ||
| 139 | program and add the correct configuration for your system. The | ||
| 140 | generic configurations "cc" or "gcc" should usually work on 32 bit | ||
| 141 | systems. | ||
| 142 | |||
| 143 | Configure creates the file Makefile.ssl from Makefile.org and | ||
| 144 | defines various macros in crypto/opensslconf.h (generated from | ||
| 145 | crypto/opensslconf.h.in). | ||
| 146 | |||
| 147 | 2. Build OpenSSL by running: | ||
| 148 | |||
| 149 | $ make | ||
| 150 | |||
| 151 | This will build the OpenSSL libraries (libcrypto.a and libssl.a) and the | ||
| 152 | OpenSSL binary ("openssl"). The libraries will be built in the top-level | ||
| 153 | directory, and the binary will be in the "apps" directory. | ||
| 154 | |||
| 155 | If "make" fails, look at the output. There may be reasons for | ||
| 156 | the failure that aren't problems in OpenSSL itself (like missing | ||
| 157 | standard headers). If it is a problem with OpenSSL itself, please | ||
| 158 | report the problem to <openssl-bugs@openssl.org> (note that your | ||
| 159 | message will be recorded in the request tracker publicly readable | ||
| 160 | via http://www.openssl.org/support/rt.html and will be forwarded to a | ||
| 161 | public mailing list). Include the output of "make report" in your message. | ||
| 162 | Please check out the request tracker. Maybe the bug was already | ||
| 163 | reported or has already been fixed. | ||
| 164 | |||
| 165 | [If you encounter assembler error messages, try the "no-asm" | ||
| 166 | configuration option as an immediate fix.] | ||
| 167 | |||
| 168 | Compiling parts of OpenSSL with gcc and others with the system | ||
| 169 | compiler will result in unresolved symbols on some systems. | ||
| 170 | |||
| 171 | 3. After a successful build, the libraries should be tested. Run: | ||
| 172 | |||
| 173 | $ make test | ||
| 174 | |||
| 175 | If a test fails, look at the output. There may be reasons for | ||
| 176 | the failure that isn't a problem in OpenSSL itself (like a missing | ||
| 177 | or malfunctioning bc). If it is a problem with OpenSSL itself, | ||
| 178 | try removing any compiler optimization flags from the CFLAG line | ||
| 179 | in Makefile.ssl and run "make clean; make". Please send a bug | ||
| 180 | report to <openssl-bugs@openssl.org>, including the output of | ||
| 181 | "make report" in order to be added to the request tracker at | ||
| 182 | http://www.openssl.org/support/rt.html. | ||
| 183 | |||
| 184 | 4. If everything tests ok, install OpenSSL with | ||
| 185 | |||
| 186 | $ make install | ||
| 187 | |||
| 188 | This will create the installation directory (if it does not exist) and | ||
| 189 | then the following subdirectories: | ||
| 190 | |||
| 191 | certs Initially empty, this is the default location | ||
| 192 | for certificate files. | ||
| 193 | man/man1 Manual pages for the 'openssl' command line tool | ||
| 194 | man/man3 Manual pages for the libraries (very incomplete) | ||
| 195 | misc Various scripts. | ||
| 196 | private Initially empty, this is the default location | ||
| 197 | for private key files. | ||
| 198 | |||
| 199 | If you didn't choose a different installation prefix, the | ||
| 200 | following additional subdirectories will be created: | ||
| 201 | |||
| 202 | bin Contains the openssl binary and a few other | ||
| 203 | utility programs. | ||
| 204 | include/openssl Contains the header files needed if you want to | ||
| 205 | compile programs with libcrypto or libssl. | ||
| 206 | lib Contains the OpenSSL library files themselves. | ||
| 207 | |||
| 208 | Use "make install_sw" to install the software without documentation, | ||
| 209 | and "install_docs_html" to install HTML renditions of the manual | ||
| 210 | pages. | ||
| 211 | |||
| 212 | Package builders who want to configure the library for standard | ||
| 213 | locations, but have the package installed somewhere else so that | ||
| 214 | it can easily be packaged, can use | ||
| 215 | |||
| 216 | $ make INSTALL_PREFIX=/tmp/package-root install | ||
| 217 | |||
| 218 | (or specify "--install_prefix=/tmp/package-root" as a configure | ||
| 219 | option). The specified prefix will be prepended to all | ||
| 220 | installation target filenames. | ||
| 221 | |||
| 222 | |||
| 223 | NOTE: The header files used to reside directly in the include | ||
| 224 | directory, but have now been moved to include/openssl so that | ||
| 225 | OpenSSL can co-exist with other libraries which use some of the | ||
| 226 | same filenames. This means that applications that use OpenSSL | ||
| 227 | should now use C preprocessor directives of the form | ||
| 228 | |||
| 229 | #include <openssl/ssl.h> | ||
| 230 | |||
| 231 | instead of "#include <ssl.h>", which was used with library versions | ||
| 232 | up to OpenSSL 0.9.2b. | ||
| 233 | |||
| 234 | If you install a new version of OpenSSL over an old library version, | ||
| 235 | you should delete the old header files in the include directory. | ||
| 236 | |||
| 237 | Compatibility issues: | ||
| 238 | |||
| 239 | * COMPILING existing applications | ||
| 240 | |||
| 241 | To compile an application that uses old filenames -- e.g. | ||
| 242 | "#include <ssl.h>" --, it will usually be enough to find | ||
| 243 | the CFLAGS definition in the application's Makefile and | ||
| 244 | add a C option such as | ||
| 245 | |||
| 246 | -I/usr/local/ssl/include/openssl | ||
| 247 | |||
| 248 | to it. | ||
| 249 | |||
| 250 | But don't delete the existing -I option that points to | ||
| 251 | the ..../include directory! Otherwise, OpenSSL header files | ||
| 252 | could not #include each other. | ||
| 253 | |||
| 254 | * WRITING applications | ||
| 255 | |||
| 256 | To write an application that is able to handle both the new | ||
| 257 | and the old directory layout, so that it can still be compiled | ||
| 258 | with library versions up to OpenSSL 0.9.2b without bothering | ||
| 259 | the user, you can proceed as follows: | ||
| 260 | |||
| 261 | - Always use the new filename of OpenSSL header files, | ||
| 262 | e.g. #include <openssl/ssl.h>. | ||
| 263 | |||
| 264 | - Create a directory "incl" that contains only a symbolic | ||
| 265 | link named "openssl", which points to the "include" directory | ||
| 266 | of OpenSSL. | ||
| 267 | For example, your application's Makefile might contain the | ||
| 268 | following rule, if OPENSSLDIR is a pathname (absolute or | ||
| 269 | relative) of the directory where OpenSSL resides: | ||
| 270 | |||
| 271 | incl/openssl: | ||
| 272 | -mkdir incl | ||
| 273 | cd $(OPENSSLDIR) # Check whether the directory really exists | ||
| 274 | -ln -s `cd $(OPENSSLDIR); pwd`/include incl/openssl | ||
| 275 | |||
| 276 | You will have to add "incl/openssl" to the dependencies | ||
| 277 | of those C files that include some OpenSSL header file. | ||
| 278 | |||
| 279 | - Add "-Iincl" to your CFLAGS. | ||
| 280 | |||
| 281 | With these additions, the OpenSSL header files will be available | ||
| 282 | under both name variants if an old library version is used: | ||
| 283 | Your application can reach them under names like <openssl/foo.h>, | ||
| 284 | while the header files still are able to #include each other | ||
| 285 | with names of the form <foo.h>. | ||
| 286 | |||
| 287 | |||
| 288 | Note on multi-threading | ||
| 289 | ----------------------- | ||
| 290 | |||
| 291 | For some systems, the OpenSSL Configure script knows what compiler options | ||
| 292 | are needed to generate a library that is suitable for multi-threaded | ||
| 293 | applications. On these systems, support for multi-threading is enabled | ||
| 294 | by default; use the "no-threads" option to disable (this should never be | ||
| 295 | necessary). | ||
| 296 | |||
| 297 | On other systems, to enable support for multi-threading, you will have | ||
| 298 | to specify at least two options: "threads", and a system-dependent option. | ||
| 299 | (The latter is "-D_REENTRANT" on various systems.) The default in this | ||
| 300 | case, obviously, is not to include support for multi-threading (but | ||
| 301 | you can still use "no-threads" to suppress an annoying warning message | ||
| 302 | from the Configure script.) | ||
| 303 | |||
| 304 | |||
| 305 | Note on shared libraries | ||
| 306 | ------------------------ | ||
| 307 | |||
| 308 | Shared libraries have certain caveats. Binary backward compatibility | ||
| 309 | can't be guaranteed before OpenSSL version 1.0. The only reason to | ||
| 310 | use them would be to conserve memory on systems where several programs | ||
| 311 | are using OpenSSL. | ||
| 312 | |||
| 313 | For some systems, the OpenSSL Configure script knows what is needed to | ||
| 314 | build shared libraries for libcrypto and libssl. On these systems, | ||
| 315 | the shared libraries are currently not created by default, but giving | ||
| 316 | the option "shared" will get them created. This method supports Makefile | ||
| 317 | targets for shared library creation, like linux-shared. Those targets | ||
| 318 | can currently be used on their own just as well, but this is expected | ||
| 319 | to change in future versions of OpenSSL. | ||
| 320 | |||
| 321 | Note on random number generation | ||
| 322 | -------------------------------- | ||
| 323 | |||
| 324 | Availability of cryptographically secure random numbers is required for | ||
| 325 | secret key generation. OpenSSL provides several options to seed the | ||
| 326 | internal PRNG. If not properly seeded, the internal PRNG will refuse | ||
| 327 | to deliver random bytes and a "PRNG not seeded error" will occur. | ||
| 328 | On systems without /dev/urandom (or similar) device, it may be necessary | ||
| 329 | to install additional support software to obtain random seed. | ||
| 330 | Please check out the manual pages for RAND_add(), RAND_bytes(), RAND_egd(), | ||
| 331 | and the FAQ for more information. | ||
| 332 | |||
| 333 | Note on support for multiple builds | ||
| 334 | ----------------------------------- | ||
| 335 | |||
| 336 | OpenSSL is usually built in its source tree. Unfortunately, this doesn't | ||
| 337 | support building for multiple platforms from the same source tree very well. | ||
| 338 | It is however possible to build in a separate tree through the use of lots | ||
| 339 | of symbolic links, which should be prepared like this: | ||
| 340 | |||
| 341 | mkdir -p objtree/"`uname -s`-`uname -r`-`uname -m`" | ||
| 342 | cd objtree/"`uname -s`-`uname -r`-`uname -m`" | ||
| 343 | (cd $OPENSSL_SOURCE; find . -type f) | while read F; do | ||
| 344 | mkdir -p `dirname $F` | ||
| 345 | rm -f $F; ln -s $OPENSSL_SOURCE/$F $F | ||
| 346 | echo $F '->' $OPENSSL_SOURCE/$F | ||
| 347 | done | ||
| 348 | make -f Makefile.org clean | ||
| 349 | |||
| 350 | OPENSSL_SOURCE is an environment variable that contains the absolute (this | ||
| 351 | is important!) path to the OpenSSL source tree. | ||
| 352 | |||
| 353 | Also, operations like 'make update' should still be made in the source tree. | ||
diff --git a/src/lib/libssl/src/crypto/bf/bf_opts.c b/src/lib/libssl/src/crypto/bf/bf_opts.c deleted file mode 100644 index da7a48740e..0000000000 --- a/src/lib/libssl/src/crypto/bf/bf_opts.c +++ /dev/null | |||
| @@ -1,330 +0,0 @@ | |||
| 1 | /* crypto/bf/bf_opts.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* define PART1, PART2, PART3 or PART4 to build only with a few of the options. | ||
| 60 | * This is for machines with 64k code segment size restrictions. */ | ||
| 61 | |||
| 62 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 63 | #define TIMES | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #include <stdio.h> | ||
| 67 | |||
| 68 | #include <openssl/e_os2.h> | ||
| 69 | #include <unistd.h> | ||
| 70 | |||
| 71 | #ifndef OPENSSL_SYS_NETWARE | ||
| 72 | #include <signal.h> | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #ifndef _IRIX | ||
| 76 | #include <time.h> | ||
| 77 | #endif | ||
| 78 | #ifdef TIMES | ||
| 79 | #include <sys/types.h> | ||
| 80 | #include <sys/times.h> | ||
| 81 | #endif | ||
| 82 | |||
| 83 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 84 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 85 | undefine TIMES, since that tells the rest of the program how things | ||
| 86 | should be handled. -- Richard Levitte */ | ||
| 87 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 88 | #undef TIMES | ||
| 89 | #endif | ||
| 90 | |||
| 91 | #ifndef TIMES | ||
| 92 | #include <sys/timeb.h> | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #if defined(sun) || defined(__ultrix) | ||
| 96 | #define _POSIX_SOURCE | ||
| 97 | #include <limits.h> | ||
| 98 | #include <sys/param.h> | ||
| 99 | #endif | ||
| 100 | |||
| 101 | #include <openssl/blowfish.h> | ||
| 102 | |||
| 103 | #define BF_DEFAULT_OPTIONS | ||
| 104 | |||
| 105 | #undef BF_ENC | ||
| 106 | #define BF_encrypt BF_encrypt_normal | ||
| 107 | #undef HEADER_BF_LOCL_H | ||
| 108 | #include "bf_enc.c" | ||
| 109 | |||
| 110 | #define BF_PTR | ||
| 111 | #undef BF_PTR2 | ||
| 112 | #undef BF_ENC | ||
| 113 | #undef BF_encrypt | ||
| 114 | #define BF_encrypt BF_encrypt_ptr | ||
| 115 | #undef HEADER_BF_LOCL_H | ||
| 116 | #include "bf_enc.c" | ||
| 117 | |||
| 118 | #undef BF_PTR | ||
| 119 | #define BF_PTR2 | ||
| 120 | #undef BF_ENC | ||
| 121 | #undef BF_encrypt | ||
| 122 | #define BF_encrypt BF_encrypt_ptr2 | ||
| 123 | #undef HEADER_BF_LOCL_H | ||
| 124 | #include "bf_enc.c" | ||
| 125 | |||
| 126 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 127 | #ifndef HZ | ||
| 128 | # ifndef CLK_TCK | ||
| 129 | # ifndef _BSD_CLK_TCK_ /* FreeBSD fix */ | ||
| 130 | # define HZ 100.0 | ||
| 131 | # else /* _BSD_CLK_TCK_ */ | ||
| 132 | # define HZ ((double)_BSD_CLK_TCK_) | ||
| 133 | # endif | ||
| 134 | # else /* CLK_TCK */ | ||
| 135 | # define HZ ((double)CLK_TCK) | ||
| 136 | # endif | ||
| 137 | #endif | ||
| 138 | |||
| 139 | #define BUFSIZE ((long)1024) | ||
| 140 | long run=0; | ||
| 141 | |||
| 142 | double Time_F(int s); | ||
| 143 | #ifdef SIGALRM | ||
| 144 | #if defined(__STDC__) || defined(sgi) | ||
| 145 | #define SIGRETTYPE void | ||
| 146 | #else | ||
| 147 | #define SIGRETTYPE int | ||
| 148 | #endif | ||
| 149 | |||
| 150 | SIGRETTYPE sig_done(int sig); | ||
| 151 | SIGRETTYPE sig_done(int sig) | ||
| 152 | { | ||
| 153 | signal(SIGALRM,sig_done); | ||
| 154 | run=0; | ||
| 155 | #ifdef LINT | ||
| 156 | sig=sig; | ||
| 157 | #endif | ||
| 158 | } | ||
| 159 | #endif | ||
| 160 | |||
| 161 | #define START 0 | ||
| 162 | #define STOP 1 | ||
| 163 | |||
| 164 | double Time_F(int s) | ||
| 165 | { | ||
| 166 | double ret; | ||
| 167 | #ifdef TIMES | ||
| 168 | static struct tms tstart,tend; | ||
| 169 | |||
| 170 | if (s == START) | ||
| 171 | { | ||
| 172 | times(&tstart); | ||
| 173 | return(0); | ||
| 174 | } | ||
| 175 | else | ||
| 176 | { | ||
| 177 | times(&tend); | ||
| 178 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 179 | return((ret == 0.0)?1e-6:ret); | ||
| 180 | } | ||
| 181 | #else /* !times() */ | ||
| 182 | static struct timeb tstart,tend; | ||
| 183 | long i; | ||
| 184 | |||
| 185 | if (s == START) | ||
| 186 | { | ||
| 187 | ftime(&tstart); | ||
| 188 | return(0); | ||
| 189 | } | ||
| 190 | else | ||
| 191 | { | ||
| 192 | ftime(&tend); | ||
| 193 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 194 | ret=((double)(tend.time-tstart.time))+((double)i)/1000.0; | ||
| 195 | return((ret == 0.0)?1e-6:ret); | ||
| 196 | } | ||
| 197 | #endif | ||
| 198 | } | ||
| 199 | |||
| 200 | #ifdef SIGALRM | ||
| 201 | #define print_name(name) fprintf(stderr,"Doing %s's for 10 seconds\n",name); alarm(10); | ||
| 202 | #else | ||
| 203 | #define print_name(name) fprintf(stderr,"Doing %s %ld times\n",name,cb); | ||
| 204 | #endif | ||
| 205 | |||
| 206 | #define time_it(func,name,index) \ | ||
| 207 | print_name(name); \ | ||
| 208 | Time_F(START); \ | ||
| 209 | for (count=0,run=1; COND(cb); count+=4) \ | ||
| 210 | { \ | ||
| 211 | unsigned long d[2]; \ | ||
| 212 | func(d,&sch); \ | ||
| 213 | func(d,&sch); \ | ||
| 214 | func(d,&sch); \ | ||
| 215 | func(d,&sch); \ | ||
| 216 | } \ | ||
| 217 | tm[index]=Time_F(STOP); \ | ||
| 218 | fprintf(stderr,"%ld %s's in %.2f second\n",count,name,tm[index]); \ | ||
| 219 | tm[index]=((double)COUNT(cb))/tm[index]; | ||
| 220 | |||
| 221 | #define print_it(name,index) \ | ||
| 222 | fprintf(stderr,"%s bytes per sec = %12.2f (%5.1fuS)\n",name, \ | ||
| 223 | tm[index]*8,1.0e6/tm[index]); | ||
| 224 | |||
| 225 | int main(int argc, char **argv) | ||
| 226 | { | ||
| 227 | long count; | ||
| 228 | static unsigned char buf[BUFSIZE]; | ||
| 229 | static char key[16]={ 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, | ||
| 230 | 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; | ||
| 231 | BF_KEY sch; | ||
| 232 | double d,tm[16],max=0; | ||
| 233 | int rank[16]; | ||
| 234 | char *str[16]; | ||
| 235 | int max_idx=0,i,num=0,j; | ||
| 236 | #ifndef SIGALARM | ||
| 237 | long ca,cb,cc,cd,ce; | ||
| 238 | #endif | ||
| 239 | |||
| 240 | for (i=0; i<12; i++) | ||
| 241 | { | ||
| 242 | tm[i]=0.0; | ||
| 243 | rank[i]=0; | ||
| 244 | } | ||
| 245 | |||
| 246 | #ifndef TIMES | ||
| 247 | fprintf(stderr,"To get the most accurate results, try to run this\n"); | ||
| 248 | fprintf(stderr,"program when this computer is idle.\n"); | ||
| 249 | #endif | ||
| 250 | |||
| 251 | BF_set_key(&sch,16,key); | ||
| 252 | |||
| 253 | #ifndef SIGALRM | ||
| 254 | fprintf(stderr,"First we calculate the approximate speed ...\n"); | ||
| 255 | count=10; | ||
| 256 | do { | ||
| 257 | long i; | ||
| 258 | unsigned long data[2]; | ||
| 259 | |||
| 260 | count*=2; | ||
| 261 | Time_F(START); | ||
| 262 | for (i=count; i; i--) | ||
| 263 | BF_encrypt(data,&sch); | ||
| 264 | d=Time_F(STOP); | ||
| 265 | } while (d < 3.0); | ||
| 266 | ca=count; | ||
| 267 | cb=count*3; | ||
| 268 | cc=count*3*8/BUFSIZE+1; | ||
| 269 | cd=count*8/BUFSIZE+1; | ||
| 270 | |||
| 271 | ce=count/20+1; | ||
| 272 | #define COND(d) (count != (d)) | ||
| 273 | #define COUNT(d) (d) | ||
| 274 | #else | ||
| 275 | #define COND(c) (run) | ||
| 276 | #define COUNT(d) (count) | ||
| 277 | signal(SIGALRM,sig_done); | ||
| 278 | alarm(10); | ||
| 279 | #endif | ||
| 280 | |||
| 281 | time_it(BF_encrypt_normal, "BF_encrypt_normal ", 0); | ||
| 282 | time_it(BF_encrypt_ptr, "BF_encrypt_ptr ", 1); | ||
| 283 | time_it(BF_encrypt_ptr2, "BF_encrypt_ptr2 ", 2); | ||
| 284 | num+=3; | ||
| 285 | |||
| 286 | str[0]="<nothing>"; | ||
| 287 | print_it("BF_encrypt_normal ",0); | ||
| 288 | max=tm[0]; | ||
| 289 | max_idx=0; | ||
| 290 | str[1]="ptr "; | ||
| 291 | print_it("BF_encrypt_ptr ",1); | ||
| 292 | if (max < tm[1]) { max=tm[1]; max_idx=1; } | ||
| 293 | str[2]="ptr2 "; | ||
| 294 | print_it("BF_encrypt_ptr2 ",2); | ||
| 295 | if (max < tm[2]) { max=tm[2]; max_idx=2; } | ||
| 296 | |||
| 297 | printf("options BF ecb/s\n"); | ||
| 298 | printf("%s %12.2f 100.0%%\n",str[max_idx],tm[max_idx]); | ||
| 299 | d=tm[max_idx]; | ||
| 300 | tm[max_idx]= -2.0; | ||
| 301 | max= -1.0; | ||
| 302 | for (;;) | ||
| 303 | { | ||
| 304 | for (i=0; i<3; i++) | ||
| 305 | { | ||
| 306 | if (max < tm[i]) { max=tm[i]; j=i; } | ||
| 307 | } | ||
| 308 | if (max < 0.0) break; | ||
| 309 | printf("%s %12.2f %4.1f%%\n",str[j],tm[j],tm[j]/d*100.0); | ||
| 310 | tm[j]= -2.0; | ||
| 311 | max= -1.0; | ||
| 312 | } | ||
| 313 | |||
| 314 | switch (max_idx) | ||
| 315 | { | ||
| 316 | case 0: | ||
| 317 | printf("-DBF_DEFAULT_OPTIONS\n"); | ||
| 318 | break; | ||
| 319 | case 1: | ||
| 320 | printf("-DBF_PTR\n"); | ||
| 321 | break; | ||
| 322 | case 2: | ||
| 323 | printf("-DBF_PTR2\n"); | ||
| 324 | break; | ||
| 325 | } | ||
| 326 | exit(0); | ||
| 327 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
| 328 | return(0); | ||
| 329 | #endif | ||
| 330 | } | ||
diff --git a/src/lib/libssl/src/crypto/bn/bn.mul b/src/lib/libssl/src/crypto/bn/bn.mul deleted file mode 100644 index 9728870d38..0000000000 --- a/src/lib/libssl/src/crypto/bn/bn.mul +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | We need | ||
| 2 | |||
| 3 | * bn_mul_comba8 | ||
| 4 | * bn_mul_comba4 | ||
| 5 | * bn_mul_normal | ||
| 6 | * bn_mul_recursive | ||
| 7 | |||
| 8 | * bn_sqr_comba8 | ||
| 9 | * bn_sqr_comba4 | ||
| 10 | bn_sqr_normal -> BN_sqr | ||
| 11 | * bn_sqr_recursive | ||
| 12 | |||
| 13 | * bn_mul_low_recursive | ||
| 14 | * bn_mul_low_normal | ||
| 15 | * bn_mul_high | ||
| 16 | |||
| 17 | * bn_mul_part_recursive # symetric but not power of 2 | ||
| 18 | |||
| 19 | bn_mul_asymetric_recursive # uneven, but do the chop up. | ||
diff --git a/src/lib/libssl/src/crypto/bn/bnspeed.c b/src/lib/libssl/src/crypto/bn/bnspeed.c deleted file mode 100644 index b554ac8cf8..0000000000 --- a/src/lib/libssl/src/crypto/bn/bnspeed.c +++ /dev/null | |||
| @@ -1,233 +0,0 @@ | |||
| 1 | /* unused */ | ||
| 2 | |||
| 3 | /* crypto/bn/bnspeed.c */ | ||
| 4 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * This package is an SSL implementation written | ||
| 8 | * by Eric Young (eay@cryptsoft.com). | ||
| 9 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 10 | * | ||
| 11 | * This library is free for commercial and non-commercial use as long as | ||
| 12 | * the following conditions are aheared to. The following conditions | ||
| 13 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 14 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 15 | * included with this distribution is covered by the same copyright terms | ||
| 16 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 17 | * | ||
| 18 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 19 | * the code are not to be removed. | ||
| 20 | * If this package is used in a product, Eric Young should be given attribution | ||
| 21 | * as the author of the parts of the library used. | ||
| 22 | * This can be in the form of a textual message at program startup or | ||
| 23 | * in documentation (online or textual) provided with the package. | ||
| 24 | * | ||
| 25 | * Redistribution and use in source and binary forms, with or without | ||
| 26 | * modification, are permitted provided that the following conditions | ||
| 27 | * are met: | ||
| 28 | * 1. Redistributions of source code must retain the copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer. | ||
| 30 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 31 | * notice, this list of conditions and the following disclaimer in the | ||
| 32 | * documentation and/or other materials provided with the distribution. | ||
| 33 | * 3. All advertising materials mentioning features or use of this software | ||
| 34 | * must display the following acknowledgement: | ||
| 35 | * "This product includes cryptographic software written by | ||
| 36 | * Eric Young (eay@cryptsoft.com)" | ||
| 37 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 38 | * being used are not cryptographic related :-). | ||
| 39 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 40 | * the apps directory (application code) you must include an acknowledgement: | ||
| 41 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 42 | * | ||
| 43 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 44 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 45 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 46 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 47 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 48 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 49 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 50 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 51 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 52 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 53 | * SUCH DAMAGE. | ||
| 54 | * | ||
| 55 | * The licence and distribution terms for any publically available version or | ||
| 56 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 57 | * copied and put under another distribution licence | ||
| 58 | * [including the GNU Public Licence.] | ||
| 59 | */ | ||
| 60 | |||
| 61 | /* most of this code has been pilfered from my libdes speed.c program */ | ||
| 62 | |||
| 63 | #define BASENUM 1000000 | ||
| 64 | #undef PROG | ||
| 65 | #define PROG bnspeed_main | ||
| 66 | |||
| 67 | #include <stdio.h> | ||
| 68 | #include <stdlib.h> | ||
| 69 | #include <signal.h> | ||
| 70 | #include <string.h> | ||
| 71 | #include <openssl/crypto.h> | ||
| 72 | #include <openssl/err.h> | ||
| 73 | |||
| 74 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 75 | #define TIMES | ||
| 76 | #endif | ||
| 77 | |||
| 78 | #ifndef _IRIX | ||
| 79 | #include <time.h> | ||
| 80 | #endif | ||
| 81 | #ifdef TIMES | ||
| 82 | #include <sys/types.h> | ||
| 83 | #include <sys/times.h> | ||
| 84 | #endif | ||
| 85 | |||
| 86 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 87 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 88 | undefine TIMES, since that tells the rest of the program how things | ||
| 89 | should be handled. -- Richard Levitte */ | ||
| 90 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 91 | #undef TIMES | ||
| 92 | #endif | ||
| 93 | |||
| 94 | #ifndef TIMES | ||
| 95 | #include <sys/timeb.h> | ||
| 96 | #endif | ||
| 97 | |||
| 98 | #if defined(sun) || defined(__ultrix) | ||
| 99 | #define _POSIX_SOURCE | ||
| 100 | #include <limits.h> | ||
| 101 | #include <sys/param.h> | ||
| 102 | #endif | ||
| 103 | |||
| 104 | #include <openssl/bn.h> | ||
| 105 | #include <openssl/x509.h> | ||
| 106 | |||
| 107 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 108 | #ifndef HZ | ||
| 109 | # ifndef CLK_TCK | ||
| 110 | # ifndef _BSD_CLK_TCK_ /* FreeBSD hack */ | ||
| 111 | # define HZ 100.0 | ||
| 112 | # else /* _BSD_CLK_TCK_ */ | ||
| 113 | # define HZ ((double)_BSD_CLK_TCK_) | ||
| 114 | # endif | ||
| 115 | # else /* CLK_TCK */ | ||
| 116 | # define HZ ((double)CLK_TCK) | ||
| 117 | # endif | ||
| 118 | #endif | ||
| 119 | |||
| 120 | #undef BUFSIZE | ||
| 121 | #define BUFSIZE ((long)1024*8) | ||
| 122 | int run=0; | ||
| 123 | |||
| 124 | static double Time_F(int s); | ||
| 125 | #define START 0 | ||
| 126 | #define STOP 1 | ||
| 127 | |||
| 128 | static double Time_F(int s) | ||
| 129 | { | ||
| 130 | double ret; | ||
| 131 | #ifdef TIMES | ||
| 132 | static struct tms tstart,tend; | ||
| 133 | |||
| 134 | if (s == START) | ||
| 135 | { | ||
| 136 | times(&tstart); | ||
| 137 | return(0); | ||
| 138 | } | ||
| 139 | else | ||
| 140 | { | ||
| 141 | times(&tend); | ||
| 142 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 143 | return((ret < 1e-3)?1e-3:ret); | ||
| 144 | } | ||
| 145 | #else /* !times() */ | ||
| 146 | static struct timeb tstart,tend; | ||
| 147 | long i; | ||
| 148 | |||
| 149 | if (s == START) | ||
| 150 | { | ||
| 151 | ftime(&tstart); | ||
| 152 | return(0); | ||
| 153 | } | ||
| 154 | else | ||
| 155 | { | ||
| 156 | ftime(&tend); | ||
| 157 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 158 | ret=((double)(tend.time-tstart.time))+((double)i)/1000.0; | ||
| 159 | return((ret < 0.001)?0.001:ret); | ||
| 160 | } | ||
| 161 | #endif | ||
| 162 | } | ||
| 163 | |||
| 164 | #define NUM_SIZES 5 | ||
| 165 | static int sizes[NUM_SIZES]={128,256,512,1024,2048}; | ||
| 166 | /*static int sizes[NUM_SIZES]={59,179,299,419,539}; */ | ||
| 167 | |||
| 168 | void do_mul(BIGNUM *r,BIGNUM *a,BIGNUM *b,BN_CTX *ctx); | ||
| 169 | |||
| 170 | int main(int argc, char **argv) | ||
| 171 | { | ||
| 172 | BN_CTX *ctx; | ||
| 173 | BIGNUM a,b,c; | ||
| 174 | |||
| 175 | ctx=BN_CTX_new(); | ||
| 176 | BN_init(&a); | ||
| 177 | BN_init(&b); | ||
| 178 | BN_init(&c); | ||
| 179 | |||
| 180 | do_mul(&a,&b,&c,ctx); | ||
| 181 | } | ||
| 182 | |||
| 183 | void do_mul(BIGNUM *r, BIGNUM *a, BIGNUM *b, BN_CTX *ctx) | ||
| 184 | { | ||
| 185 | int i,j,k; | ||
| 186 | double tm; | ||
| 187 | long num; | ||
| 188 | |||
| 189 | for (i=0; i<NUM_SIZES; i++) | ||
| 190 | { | ||
| 191 | num=BASENUM; | ||
| 192 | if (i) num/=(i*3); | ||
| 193 | BN_rand(a,sizes[i],1,0); | ||
| 194 | for (j=i; j<NUM_SIZES; j++) | ||
| 195 | { | ||
| 196 | BN_rand(b,sizes[j],1,0); | ||
| 197 | Time_F(START); | ||
| 198 | for (k=0; k<num; k++) | ||
| 199 | BN_mul(r,b,a,ctx); | ||
| 200 | tm=Time_F(STOP); | ||
| 201 | printf("mul %4d x %4d -> %8.3fms\n",sizes[i],sizes[j],tm*1000.0/num); | ||
| 202 | } | ||
| 203 | } | ||
| 204 | |||
| 205 | for (i=0; i<NUM_SIZES; i++) | ||
| 206 | { | ||
| 207 | num=BASENUM; | ||
| 208 | if (i) num/=(i*3); | ||
| 209 | BN_rand(a,sizes[i],1,0); | ||
| 210 | Time_F(START); | ||
| 211 | for (k=0; k<num; k++) | ||
| 212 | BN_sqr(r,a,ctx); | ||
| 213 | tm=Time_F(STOP); | ||
| 214 | printf("sqr %4d x %4d -> %8.3fms\n",sizes[i],sizes[i],tm*1000.0/num); | ||
| 215 | } | ||
| 216 | |||
| 217 | for (i=0; i<NUM_SIZES; i++) | ||
| 218 | { | ||
| 219 | num=BASENUM/10; | ||
| 220 | if (i) num/=(i*3); | ||
| 221 | BN_rand(a,sizes[i]-1,1,0); | ||
| 222 | for (j=i; j<NUM_SIZES; j++) | ||
| 223 | { | ||
| 224 | BN_rand(b,sizes[j],1,0); | ||
| 225 | Time_F(START); | ||
| 226 | for (k=0; k<100000; k++) | ||
| 227 | BN_div(r, NULL, b, a,ctx); | ||
| 228 | tm=Time_F(STOP); | ||
| 229 | printf("div %4d / %4d -> %8.3fms\n",sizes[j],sizes[i]-1,tm*1000.0/num); | ||
| 230 | } | ||
| 231 | } | ||
| 232 | } | ||
| 233 | |||
diff --git a/src/lib/libssl/src/crypto/bn/exp.c b/src/lib/libssl/src/crypto/bn/exp.c deleted file mode 100644 index 4865b0ef74..0000000000 --- a/src/lib/libssl/src/crypto/bn/exp.c +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | /* unused */ | ||
| 2 | |||
| 3 | #include <stdio.h> | ||
| 4 | #include <openssl/tmdiff.h> | ||
| 5 | #include "bn_lcl.h" | ||
| 6 | |||
| 7 | #define SIZE 256 | ||
| 8 | #define NUM (8*8*8) | ||
| 9 | #define MOD (8*8*8*8*8) | ||
| 10 | |||
| 11 | main(argc,argv) | ||
| 12 | int argc; | ||
| 13 | char *argv[]; | ||
| 14 | { | ||
| 15 | BN_CTX ctx; | ||
| 16 | BIGNUM a,b,c,r,rr,t,l; | ||
| 17 | int j,i,size=SIZE,num=NUM,mod=MOD; | ||
| 18 | char *start,*end; | ||
| 19 | BN_MONT_CTX mont; | ||
| 20 | double d,md; | ||
| 21 | |||
| 22 | BN_MONT_CTX_init(&mont); | ||
| 23 | BN_CTX_init(&ctx); | ||
| 24 | BN_init(&a); | ||
| 25 | BN_init(&b); | ||
| 26 | BN_init(&c); | ||
| 27 | BN_init(&r); | ||
| 28 | |||
| 29 | start=ms_time_new(); | ||
| 30 | end=ms_time_new(); | ||
| 31 | while (size <= 1024*8) | ||
| 32 | { | ||
| 33 | BN_rand(&a,size,0,0); | ||
| 34 | BN_rand(&b,size,1,0); | ||
| 35 | BN_rand(&c,size,0,1); | ||
| 36 | |||
| 37 | BN_mod(&a,&a,&c,&ctx); | ||
| 38 | |||
| 39 | ms_time_get(start); | ||
| 40 | for (i=0; i<10; i++) | ||
| 41 | BN_MONT_CTX_set(&mont,&c,&ctx); | ||
| 42 | ms_time_get(end); | ||
| 43 | md=ms_time_diff(start,end); | ||
| 44 | |||
| 45 | ms_time_get(start); | ||
| 46 | for (i=0; i<num; i++) | ||
| 47 | { | ||
| 48 | /* bn_mull(&r,&a,&b,&ctx); */ | ||
| 49 | /* BN_sqr(&r,&a,&ctx); */ | ||
| 50 | BN_mod_exp_mont(&r,&a,&b,&c,&ctx,&mont); | ||
| 51 | } | ||
| 52 | ms_time_get(end); | ||
| 53 | d=ms_time_diff(start,end)/* *50/33 */; | ||
| 54 | printf("%5d bit:%6.2f %6d %6.4f %4d m_set(%5.4f)\n",size, | ||
| 55 | d,num,d/num,(int)((d/num)*mod),md/10.0); | ||
| 56 | num/=8; | ||
| 57 | mod/=8; | ||
| 58 | if (num <= 0) num=1; | ||
| 59 | size*=2; | ||
| 60 | } | ||
| 61 | |||
| 62 | } | ||
diff --git a/src/lib/libssl/src/crypto/bn/expspeed.c b/src/lib/libssl/src/crypto/bn/expspeed.c deleted file mode 100644 index 1b434db1ab..0000000000 --- a/src/lib/libssl/src/crypto/bn/expspeed.c +++ /dev/null | |||
| @@ -1,347 +0,0 @@ | |||
| 1 | /* unused */ | ||
| 2 | |||
| 3 | /* crypto/bn/expspeed.c */ | ||
| 4 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * This package is an SSL implementation written | ||
| 8 | * by Eric Young (eay@cryptsoft.com). | ||
| 9 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 10 | * | ||
| 11 | * This library is free for commercial and non-commercial use as long as | ||
| 12 | * the following conditions are aheared to. The following conditions | ||
| 13 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 14 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 15 | * included with this distribution is covered by the same copyright terms | ||
| 16 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 17 | * | ||
| 18 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 19 | * the code are not to be removed. | ||
| 20 | * If this package is used in a product, Eric Young should be given attribution | ||
| 21 | * as the author of the parts of the library used. | ||
| 22 | * This can be in the form of a textual message at program startup or | ||
| 23 | * in documentation (online or textual) provided with the package. | ||
| 24 | * | ||
| 25 | * Redistribution and use in source and binary forms, with or without | ||
| 26 | * modification, are permitted provided that the following conditions | ||
| 27 | * are met: | ||
| 28 | * 1. Redistributions of source code must retain the copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer. | ||
| 30 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 31 | * notice, this list of conditions and the following disclaimer in the | ||
| 32 | * documentation and/or other materials provided with the distribution. | ||
| 33 | * 3. All advertising materials mentioning features or use of this software | ||
| 34 | * must display the following acknowledgement: | ||
| 35 | * "This product includes cryptographic software written by | ||
| 36 | * Eric Young (eay@cryptsoft.com)" | ||
| 37 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 38 | * being used are not cryptographic related :-). | ||
| 39 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 40 | * the apps directory (application code) you must include an acknowledgement: | ||
| 41 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 42 | * | ||
| 43 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 44 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 45 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 46 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 47 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 48 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 49 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 50 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 51 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 52 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 53 | * SUCH DAMAGE. | ||
| 54 | * | ||
| 55 | * The licence and distribution terms for any publically available version or | ||
| 56 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 57 | * copied and put under another distribution licence | ||
| 58 | * [including the GNU Public Licence.] | ||
| 59 | */ | ||
| 60 | |||
| 61 | /* most of this code has been pilfered from my libdes speed.c program */ | ||
| 62 | |||
| 63 | #define BASENUM 5000 | ||
| 64 | #define NUM_START 0 | ||
| 65 | |||
| 66 | |||
| 67 | /* determine timings for modexp, modmul, modsqr, gcd, Kronecker symbol, | ||
| 68 | * modular inverse, or modular square roots */ | ||
| 69 | #define TEST_EXP | ||
| 70 | #undef TEST_MUL | ||
| 71 | #undef TEST_SQR | ||
| 72 | #undef TEST_GCD | ||
| 73 | #undef TEST_KRON | ||
| 74 | #undef TEST_INV | ||
| 75 | #undef TEST_SQRT | ||
| 76 | #define P_MOD_64 9 /* least significant 6 bits for prime to be used for BN_sqrt timings */ | ||
| 77 | |||
| 78 | #if defined(TEST_EXP) + defined(TEST_MUL) + defined(TEST_SQR) + defined(TEST_GCD) + defined(TEST_KRON) + defined(TEST_INV) +defined(TEST_SQRT) != 1 | ||
| 79 | # error "choose one test" | ||
| 80 | #endif | ||
| 81 | |||
| 82 | #if defined(TEST_INV) || defined(TEST_SQRT) | ||
| 83 | # define C_PRIME | ||
| 84 | static void genprime_cb(int p, int n, void *arg); | ||
| 85 | #endif | ||
| 86 | |||
| 87 | |||
| 88 | |||
| 89 | #undef PROG | ||
| 90 | #define PROG bnspeed_main | ||
| 91 | |||
| 92 | #include <stdio.h> | ||
| 93 | #include <stdlib.h> | ||
| 94 | #include <signal.h> | ||
| 95 | #include <string.h> | ||
| 96 | #include <openssl/crypto.h> | ||
| 97 | #include <openssl/err.h> | ||
| 98 | #include <openssl/rand.h> | ||
| 99 | |||
| 100 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 101 | #define TIMES | ||
| 102 | #endif | ||
| 103 | |||
| 104 | #ifndef _IRIX | ||
| 105 | #include <time.h> | ||
| 106 | #endif | ||
| 107 | #ifdef TIMES | ||
| 108 | #include <sys/types.h> | ||
| 109 | #include <sys/times.h> | ||
| 110 | #endif | ||
| 111 | |||
| 112 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 113 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 114 | undefine TIMES, since that tells the rest of the program how things | ||
| 115 | should be handled. -- Richard Levitte */ | ||
| 116 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 117 | #undef TIMES | ||
| 118 | #endif | ||
| 119 | |||
| 120 | #ifndef TIMES | ||
| 121 | #include <sys/timeb.h> | ||
| 122 | #endif | ||
| 123 | |||
| 124 | #if defined(sun) || defined(__ultrix) | ||
| 125 | #define _POSIX_SOURCE | ||
| 126 | #include <limits.h> | ||
| 127 | #include <sys/param.h> | ||
| 128 | #endif | ||
| 129 | |||
| 130 | #include <openssl/bn.h> | ||
| 131 | #include <openssl/x509.h> | ||
| 132 | |||
| 133 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 134 | #ifndef HZ | ||
| 135 | # ifndef CLK_TCK | ||
| 136 | # ifndef _BSD_CLK_TCK_ /* FreeBSD hack */ | ||
| 137 | # define HZ 100.0 | ||
| 138 | # else /* _BSD_CLK_TCK_ */ | ||
| 139 | # define HZ ((double)_BSD_CLK_TCK_) | ||
| 140 | # endif | ||
| 141 | # else /* CLK_TCK */ | ||
| 142 | # define HZ ((double)CLK_TCK) | ||
| 143 | # endif | ||
| 144 | #endif | ||
| 145 | |||
| 146 | #undef BUFSIZE | ||
| 147 | #define BUFSIZE ((long)1024*8) | ||
| 148 | int run=0; | ||
| 149 | |||
| 150 | static double Time_F(int s); | ||
| 151 | #define START 0 | ||
| 152 | #define STOP 1 | ||
| 153 | |||
| 154 | static double Time_F(int s) | ||
| 155 | { | ||
| 156 | double ret; | ||
| 157 | #ifdef TIMES | ||
| 158 | static struct tms tstart,tend; | ||
| 159 | |||
| 160 | if (s == START) | ||
| 161 | { | ||
| 162 | times(&tstart); | ||
| 163 | return(0); | ||
| 164 | } | ||
| 165 | else | ||
| 166 | { | ||
| 167 | times(&tend); | ||
| 168 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 169 | return((ret < 1e-3)?1e-3:ret); | ||
| 170 | } | ||
| 171 | #else /* !times() */ | ||
| 172 | static struct timeb tstart,tend; | ||
| 173 | long i; | ||
| 174 | |||
| 175 | if (s == START) | ||
| 176 | { | ||
| 177 | ftime(&tstart); | ||
| 178 | return(0); | ||
| 179 | } | ||
| 180 | else | ||
| 181 | { | ||
| 182 | ftime(&tend); | ||
| 183 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 184 | ret=((double)(tend.time-tstart.time))+((double)i)/1000.0; | ||
| 185 | return((ret < 0.001)?0.001:ret); | ||
| 186 | } | ||
| 187 | #endif | ||
| 188 | } | ||
| 189 | |||
| 190 | #define NUM_SIZES 7 | ||
| 191 | #if NUM_START > NUM_SIZES | ||
| 192 | # error "NUM_START > NUM_SIZES" | ||
| 193 | #endif | ||
| 194 | static int sizes[NUM_SIZES]={128,256,512,1024,2048,4096,8192}; | ||
| 195 | static int mul_c[NUM_SIZES]={8*8*8*8*8*8,8*8*8*8*8,8*8*8*8,8*8*8,8*8,8,1}; | ||
| 196 | /*static int sizes[NUM_SIZES]={59,179,299,419,539}; */ | ||
| 197 | |||
| 198 | void do_mul_exp(BIGNUM *r,BIGNUM *a,BIGNUM *b,BIGNUM *c,BN_CTX *ctx); | ||
| 199 | |||
| 200 | int main(int argc, char **argv) | ||
| 201 | { | ||
| 202 | BN_CTX *ctx; | ||
| 203 | BIGNUM *a,*b,*c,*r; | ||
| 204 | |||
| 205 | #if 1 | ||
| 206 | if (!CRYPTO_set_mem_debug_functions(0,0,0,0,0)) | ||
| 207 | abort(); | ||
| 208 | #endif | ||
| 209 | |||
| 210 | ctx=BN_CTX_new(); | ||
| 211 | a=BN_new(); | ||
| 212 | b=BN_new(); | ||
| 213 | c=BN_new(); | ||
| 214 | r=BN_new(); | ||
| 215 | |||
| 216 | do_mul_exp(r,a,b,c,ctx); | ||
| 217 | return 0; | ||
| 218 | } | ||
| 219 | |||
| 220 | void do_mul_exp(BIGNUM *r, BIGNUM *a, BIGNUM *b, BIGNUM *c, BN_CTX *ctx) | ||
| 221 | { | ||
| 222 | int i,k; | ||
| 223 | double tm; | ||
| 224 | long num; | ||
| 225 | |||
| 226 | num=BASENUM; | ||
| 227 | for (i=NUM_START; i<NUM_SIZES; i++) | ||
| 228 | { | ||
| 229 | #ifdef C_PRIME | ||
| 230 | # ifdef TEST_SQRT | ||
| 231 | if (!BN_set_word(a, 64)) goto err; | ||
| 232 | if (!BN_set_word(b, P_MOD_64)) goto err; | ||
| 233 | # define ADD a | ||
| 234 | # define REM b | ||
| 235 | # else | ||
| 236 | # define ADD NULL | ||
| 237 | # define REM NULL | ||
| 238 | # endif | ||
| 239 | if (!BN_generate_prime(c,sizes[i],0,ADD,REM,genprime_cb,NULL)) goto err; | ||
| 240 | putc('\n', stderr); | ||
| 241 | fflush(stderr); | ||
| 242 | #endif | ||
| 243 | |||
| 244 | for (k=0; k<num; k++) | ||
| 245 | { | ||
| 246 | if (k%50 == 0) /* Average over num/50 different choices of random numbers. */ | ||
| 247 | { | ||
| 248 | if (!BN_pseudo_rand(a,sizes[i],1,0)) goto err; | ||
| 249 | |||
| 250 | if (!BN_pseudo_rand(b,sizes[i],1,0)) goto err; | ||
| 251 | |||
| 252 | #ifndef C_PRIME | ||
| 253 | if (!BN_pseudo_rand(c,sizes[i],1,1)) goto err; | ||
| 254 | #endif | ||
| 255 | |||
| 256 | #ifdef TEST_SQRT | ||
| 257 | if (!BN_mod_sqr(a,a,c,ctx)) goto err; | ||
| 258 | if (!BN_mod_sqr(b,b,c,ctx)) goto err; | ||
| 259 | #else | ||
| 260 | if (!BN_nnmod(a,a,c,ctx)) goto err; | ||
| 261 | if (!BN_nnmod(b,b,c,ctx)) goto err; | ||
| 262 | #endif | ||
| 263 | |||
| 264 | if (k == 0) | ||
| 265 | Time_F(START); | ||
| 266 | } | ||
| 267 | |||
| 268 | #if defined(TEST_EXP) | ||
| 269 | if (!BN_mod_exp(r,a,b,c,ctx)) goto err; | ||
| 270 | #elif defined(TEST_MUL) | ||
| 271 | { | ||
| 272 | int i = 0; | ||
| 273 | for (i = 0; i < 50; i++) | ||
| 274 | if (!BN_mod_mul(r,a,b,c,ctx)) goto err; | ||
| 275 | } | ||
| 276 | #elif defined(TEST_SQR) | ||
| 277 | { | ||
| 278 | int i = 0; | ||
| 279 | for (i = 0; i < 50; i++) | ||
| 280 | { | ||
| 281 | if (!BN_mod_sqr(r,a,c,ctx)) goto err; | ||
| 282 | if (!BN_mod_sqr(r,b,c,ctx)) goto err; | ||
| 283 | } | ||
| 284 | } | ||
| 285 | #elif defined(TEST_GCD) | ||
| 286 | if (!BN_gcd(r,a,b,ctx)) goto err; | ||
| 287 | if (!BN_gcd(r,b,c,ctx)) goto err; | ||
| 288 | if (!BN_gcd(r,c,a,ctx)) goto err; | ||
| 289 | #elif defined(TEST_KRON) | ||
| 290 | if (-2 == BN_kronecker(a,b,ctx)) goto err; | ||
| 291 | if (-2 == BN_kronecker(b,c,ctx)) goto err; | ||
| 292 | if (-2 == BN_kronecker(c,a,ctx)) goto err; | ||
| 293 | #elif defined(TEST_INV) | ||
| 294 | if (!BN_mod_inverse(r,a,c,ctx)) goto err; | ||
| 295 | if (!BN_mod_inverse(r,b,c,ctx)) goto err; | ||
| 296 | #else /* TEST_SQRT */ | ||
| 297 | if (!BN_mod_sqrt(r,a,c,ctx)) goto err; | ||
| 298 | if (!BN_mod_sqrt(r,b,c,ctx)) goto err; | ||
| 299 | #endif | ||
| 300 | } | ||
| 301 | tm=Time_F(STOP); | ||
| 302 | printf( | ||
| 303 | #if defined(TEST_EXP) | ||
| 304 | "modexp %4d ^ %4d %% %4d" | ||
| 305 | #elif defined(TEST_MUL) | ||
| 306 | "50*modmul %4d %4d %4d" | ||
| 307 | #elif defined(TEST_SQR) | ||
| 308 | "100*modsqr %4d %4d %4d" | ||
| 309 | #elif defined(TEST_GCD) | ||
| 310 | "3*gcd %4d %4d %4d" | ||
| 311 | #elif defined(TEST_KRON) | ||
| 312 | "3*kronecker %4d %4d %4d" | ||
| 313 | #elif defined(TEST_INV) | ||
| 314 | "2*inv %4d %4d mod %4d" | ||
| 315 | #else /* TEST_SQRT */ | ||
| 316 | "2*sqrt [prime == %d (mod 64)] %4d %4d mod %4d" | ||
| 317 | #endif | ||
| 318 | " -> %8.6fms %5.1f (%ld)\n", | ||
| 319 | #ifdef TEST_SQRT | ||
| 320 | P_MOD_64, | ||
| 321 | #endif | ||
| 322 | sizes[i],sizes[i],sizes[i],tm*1000.0/num,tm*mul_c[i]/num, num); | ||
| 323 | num/=7; | ||
| 324 | if (num <= 0) num=1; | ||
| 325 | } | ||
| 326 | return; | ||
| 327 | |||
| 328 | err: | ||
| 329 | ERR_print_errors_fp(stderr); | ||
| 330 | } | ||
| 331 | |||
| 332 | |||
| 333 | #ifdef C_PRIME | ||
| 334 | static void genprime_cb(int p, int n, void *arg) | ||
| 335 | { | ||
| 336 | char c='*'; | ||
| 337 | |||
| 338 | if (p == 0) c='.'; | ||
| 339 | if (p == 1) c='+'; | ||
| 340 | if (p == 2) c='*'; | ||
| 341 | if (p == 3) c='\n'; | ||
| 342 | putc(c, stderr); | ||
| 343 | fflush(stderr); | ||
| 344 | (void)n; | ||
| 345 | (void)arg; | ||
| 346 | } | ||
| 347 | #endif | ||
diff --git a/src/lib/libssl/src/crypto/des/FILES0 b/src/lib/libssl/src/crypto/des/FILES0 deleted file mode 100644 index 2e8211ad2a..0000000000 --- a/src/lib/libssl/src/crypto/des/FILES0 +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | /* General stuff */ | ||
| 2 | COPYRIGHT - Copyright info. | ||
| 3 | FILES - This file. | ||
| 4 | README - What this package is. | ||
| 5 | VERSION - Which version this is and what was changed. | ||
| 6 | |||
| 7 | /* libdes.a source code */ | ||
| 8 | des.h - Public libdes.a header file. | ||
| 9 | ecb_enc.c - des_ecb_encrypt() source, this contains the basic DES code. | ||
| 10 | ecb3_enc.c - des_ecb3_encrypt() source. | ||
| 11 | cbc_ckm.c - des_cbc_cksum() source. | ||
| 12 | cbc_enc.c - des_cbc_encrypt() source. | ||
| 13 | ncbc_enc.c - des_cbc_encrypt() that is 'normal' in that it copies | ||
| 14 | the new iv values back in the passed iv vector. | ||
| 15 | ede_enc.c - des_ede3_cbc_encrypt() cbc mode des using triple DES. | ||
| 16 | cbc3_enc.c - des_3cbc_encrypt() source, don't use this function. | ||
| 17 | cfb_enc.c - des_cfb_encrypt() source. | ||
| 18 | cfb64enc.c - des_cfb64_encrypt() cfb in 64 bit mode but setup to be | ||
| 19 | used as a stream cipher. | ||
| 20 | cfb64ede.c - des_ede3_cfb64_encrypt() cfb in 64 bit mode but setup to be | ||
| 21 | used as a stream cipher and using triple DES. | ||
| 22 | ofb_enc.c - des_cfb_encrypt() source. | ||
| 23 | ofb64_enc.c - des_ofb_encrypt() ofb in 64 bit mode but setup to be | ||
| 24 | used as a stream cipher. | ||
| 25 | ofb64ede.c - des_ede3_ofb64_encrypt() ofb in 64 bit mode but setup to be | ||
| 26 | used as a stream cipher and using triple DES. | ||
| 27 | enc_read.c - des_enc_read() source. | ||
| 28 | enc_writ.c - des_enc_write() source. | ||
| 29 | pcbc_enc.c - des_pcbc_encrypt() source. | ||
| 30 | qud_cksm.c - quad_cksum() source. | ||
| 31 | rand_key.c - des_random_key() source. | ||
| 32 | read_pwd.c - Source for des_read_password() plus related functions. | ||
| 33 | set_key.c - Source for des_set_key(). | ||
| 34 | str2key.c - Covert a string of any length into a key. | ||
| 35 | fcrypt.c - A small, fast version of crypt(3). | ||
| 36 | des_locl.h - Internal libdes.a header file. | ||
| 37 | podd.h - Odd parity tables - used in des_set_key(). | ||
| 38 | sk.h - Lookup tables used in des_set_key(). | ||
| 39 | spr.h - What is left of the S tables - used in ecb_encrypt(). | ||
| 40 | des_ver.h - header file for the external definition of the | ||
| 41 | version string. | ||
| 42 | des.doc - SSLeay documentation for the library. | ||
| 43 | |||
| 44 | |||
diff --git a/src/lib/libssl/src/crypto/des/README b/src/lib/libssl/src/crypto/des/README deleted file mode 100644 index 621a5ab467..0000000000 --- a/src/lib/libssl/src/crypto/des/README +++ /dev/null | |||
| @@ -1,54 +0,0 @@ | |||
| 1 | |||
| 2 | libdes, Version 4.01 10-Jan-97 | ||
| 3 | |||
| 4 | Copyright (c) 1997, Eric Young | ||
| 5 | All rights reserved. | ||
| 6 | |||
| 7 | This program is free software; you can redistribute it and/or modify | ||
| 8 | it under the terms specified in COPYRIGHT. | ||
| 9 | |||
| 10 | -- | ||
| 11 | The primary ftp site for this library is | ||
| 12 | ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/libdes-x.xx.tar.gz | ||
| 13 | libdes is now also shipped with SSLeay. Primary ftp site of | ||
| 14 | ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL/SSLeay-x.x.x.tar.gz | ||
| 15 | |||
| 16 | The best way to build this library is to build it as part of SSLeay. | ||
| 17 | |||
| 18 | This kit builds a DES encryption library and a DES encryption program. | ||
| 19 | It supports ecb, cbc, ofb, cfb, triple ecb, triple cbc, triple ofb, | ||
| 20 | triple cfb, desx, and MIT's pcbc encryption modes and also has a fast | ||
| 21 | implementation of crypt(3). | ||
| 22 | It contains support routines to read keys from a terminal, | ||
| 23 | generate a random key, generate a key from an arbitrary length string, | ||
| 24 | read/write encrypted data from/to a file descriptor. | ||
| 25 | |||
| 26 | The implementation was written so as to conform with the manual entry | ||
| 27 | for the des_crypt(3) library routines from MIT's project Athena. | ||
| 28 | |||
| 29 | destest should be run after compilation to test the des routines. | ||
| 30 | rpw should be run after compilation to test the read password routines. | ||
| 31 | The des program is a replacement for the sun des command. I believe it | ||
| 32 | conforms to the sun version. | ||
| 33 | |||
| 34 | The Imakefile is setup for use in the kerberos distribution. | ||
| 35 | |||
| 36 | These routines are best compiled with gcc or any other good | ||
| 37 | optimising compiler. | ||
| 38 | Just turn you optimiser up to the highest settings and run destest | ||
| 39 | after the build to make sure everything works. | ||
| 40 | |||
| 41 | I believe these routines are close to the fastest and most portable DES | ||
| 42 | routines that use small lookup tables (4.5k) that are publicly available. | ||
| 43 | The fcrypt routine is faster than ufc's fcrypt (when compiling with | ||
| 44 | gcc2 -O2) on the sparc 2 (1410 vs 1270) but is not so good on other machines | ||
| 45 | (on a sun3/260 168 vs 336). It is a function of CPU on chip cache size. | ||
| 46 | [ 10-Jan-97 and a function of an incorrect speed testing program in | ||
| 47 | ufc which gave much better test figures that reality ]. | ||
| 48 | |||
| 49 | It is worth noting that on sparc and Alpha CPUs, performance of the DES | ||
| 50 | library can vary by upto %10 due to the positioning of files after application | ||
| 51 | linkage. | ||
| 52 | |||
| 53 | Eric Young (eay@cryptsoft.com) | ||
| 54 | |||
diff --git a/src/lib/libssl/src/crypto/des/VERSION b/src/lib/libssl/src/crypto/des/VERSION deleted file mode 100644 index c7d01542bc..0000000000 --- a/src/lib/libssl/src/crypto/des/VERSION +++ /dev/null | |||
| @@ -1,412 +0,0 @@ | |||
| 1 | Fixed the weak key values which were wrong :-( | ||
| 2 | Defining SIGACTION causes sigaction() to be used instead of signal(). | ||
| 3 | SIGUSR1/SIGUSR2 are no longer mapped in the read tty stuff because it | ||
| 4 | can cause problems. This should hopefully not affect normal | ||
| 5 | applications. | ||
| 6 | |||
| 7 | Version 4.04 | ||
| 8 | Fixed a few tests in destest. Also added x86 assember for | ||
| 9 | des_ncbc_encrypt() which is the standard cbc mode function. | ||
| 10 | This makes a very very large performace difference. | ||
| 11 | Ariel Glenn ariel@columbia.edu reports that the terminal | ||
| 12 | 'turn echo off' can return (errno == EINVAL) under solaris | ||
| 13 | when redirection is used. So I now catch that as well as ENOTTY. | ||
| 14 | |||
| 15 | |||
| 16 | Version 4.03 | ||
| 17 | Left a static out of enc_write.c, which caused to buffer to be | ||
| 18 | continiously malloc()ed. Does anyone use these functions? I keep | ||
| 19 | on feeling like removing them since I only had these in there | ||
| 20 | for a version of kerberised login. Anyway, this was pointed out | ||
| 21 | by Theo de Raadt <deraadt@cvs.openbsd.org> | ||
| 22 | The 'n' bit ofb code was wrong, it was not shifting the shift | ||
| 23 | register. It worked correctly for n == 64. Thanks to | ||
| 24 | Gigi Ankeny <Gigi.Ankeny@Eng.Sun.COM> for pointing this one out. | ||
| 25 | |||
| 26 | Version 4.02 | ||
| 27 | I was doing 'if (memcmp(weak_keys[i],key,sizeof(key)) == 0)' | ||
| 28 | when checking for weak keys which is wrong :-(, pointed out by | ||
| 29 | Markus F.X.J. Oberhumer <markus.oberhumer@jk.uni-linz.ac.at>. | ||
| 30 | |||
| 31 | Version 4.01 | ||
| 32 | Even faster inner loop in the DES assembler for x86 and a modification | ||
| 33 | for IP/FP which is faster on x86. Both of these changes are | ||
| 34 | from Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>. His | ||
| 35 | changes make the assembler run %40 faster on a pentium. This is just | ||
| 36 | a case of getting the instruction sequence 'just right'. | ||
| 37 | All credit to 'Svend' :-) | ||
| 38 | Quite a few special x86 'make' targets. | ||
| 39 | A libdes-l (lite) distribution. | ||
| 40 | |||
| 41 | Version 4.00 | ||
| 42 | After a bit of a pause, I'll up the major version number since this | ||
| 43 | is mostly a performace release. I've added x86 assembler and | ||
| 44 | added more options for performance. A %28 speedup for gcc | ||
| 45 | on a pentium and the assembler is a %50 speedup. | ||
| 46 | MIPS CPU's, sparc and Alpha are the main CPU's with speedups. | ||
| 47 | Run des_opts to work out which options should be used. | ||
| 48 | DES_RISC1/DES_RISC2 use alternative inner loops which use | ||
| 49 | more registers but should give speedups on any CPU that does | ||
| 50 | dual issue (pentium). DES_UNROLL unrolls the inner loop, | ||
| 51 | which costs in code size. | ||
| 52 | |||
| 53 | Version 3.26 | ||
| 54 | I've finally removed one of the shifts in D_ENCRYPT. This | ||
| 55 | meant I've changed the des_SPtrans table (spr.h), the set_key() | ||
| 56 | function and some things in des_enc.c. This has definitly | ||
| 57 | made things faster :-). I've known about this one for some | ||
| 58 | time but I've been too lazy to follow it up :-). | ||
| 59 | Noticed that in the D_ENCRYPT() macro, we can just do L^=(..)^(..)^.. | ||
| 60 | instead of L^=((..)|(..)|(..).. This should save a register at | ||
| 61 | least. | ||
| 62 | Assember for x86. The file to replace is des_enc.c, which is replaced | ||
| 63 | by one of the assembler files found in asm. Look at des/asm/readme | ||
| 64 | for more info. | ||
| 65 | |||
| 66 | /* Modification to fcrypt so it can be compiled to support | ||
| 67 | HPUX 10.x's long password format, define -DLONGCRYPT to use this. | ||
| 68 | Thanks to Jens Kupferschmidt <bt1cu@hpboot.rz.uni-leipzig.de>. */ | ||
| 69 | |||
| 70 | SIGWINCH case put in des_read_passwd() so the function does not | ||
| 71 | 'exit' if this function is recieved. | ||
| 72 | |||
| 73 | Version 3.25 17/07/96 | ||
| 74 | Modified read_pwd.c so that stdin can be read if not a tty. | ||
| 75 | Thanks to Jeff Barber <jeffb@issl.atl.hp.com> for the patches. | ||
| 76 | des_init_random_number_generator() shortened due to VMS linker | ||
| 77 | limits. | ||
| 78 | Added RSA's DESX cbc mode. It is a form of cbc encryption, with 2 | ||
| 79 | 8 byte quantites xored before and after encryption. | ||
| 80 | des_xcbc_encryption() - the name is funny to preserve the des_ | ||
| 81 | prefix on all functions. | ||
| 82 | |||
| 83 | Version 3.24 20/04/96 | ||
| 84 | The DES_PTR macro option checked and used by SSLeay configuration | ||
| 85 | |||
| 86 | Version 3.23 11/04/96 | ||
| 87 | Added DES_LONG. If defined to 'unsigned int' on the DEC Alpha, | ||
| 88 | it gives a %20 speedup :-) | ||
| 89 | Fixed the problem with des.pl under perl5. The patches were | ||
| 90 | sent by Ed Kubaitis (ejk@uiuc.edu). | ||
| 91 | if fcrypt.c, changed values to handle illegal salt values the way | ||
| 92 | normal crypt() implementations do. Some programs apparently use | ||
| 93 | them :-(. The patch was sent by Bjorn Gronvall <bg@sics.se> | ||
| 94 | |||
| 95 | Version 3.22 29/11/95 | ||
| 96 | Bug in des(1), an error with the uuencoding stuff when the | ||
| 97 | 'data' is small, thanks to Geoff Keating <keagchon@mehta.anu.edu.au> | ||
| 98 | for the patch. | ||
| 99 | |||
| 100 | Version 3.21 22/11/95 | ||
| 101 | After some emailing back and forth with | ||
| 102 | Colin Plumb <colin@nyx10.cs.du.edu>, I've tweaked a few things | ||
| 103 | and in a future version I will probably put in some of the | ||
| 104 | optimisation he suggested for use with the DES_USE_PTR option. | ||
| 105 | Extra routines from Mark Murray <mark@grondar.za> for use in | ||
| 106 | freeBSD. They mostly involve random number generation for use | ||
| 107 | with kerberos. They involve evil machine specific system calls | ||
| 108 | etc so I would normally suggest pushing this stuff into the | ||
| 109 | application and/or using RAND_seed()/RAND_bytes() if you are | ||
| 110 | using this DES library as part of SSLeay. | ||
| 111 | Redone the read_pw() function so that it is cleaner and | ||
| 112 | supports termios, thanks to Sameer Parekh <sameer@c2.org> | ||
| 113 | for the initial patches for this. | ||
| 114 | Renamed 3ecb_encrypt() to ecb3_encrypt(). This has been | ||
| 115 | done just to make things more consistent. | ||
| 116 | I have also now added triple DES versions of cfb and ofb. | ||
| 117 | |||
| 118 | Version 3.20 | ||
| 119 | Damn, Damn, Damn, as pointed out by Mike_Spreitzer.PARC@xerox.com, | ||
| 120 | my des_random_seed() function was only copying 4 bytes of the | ||
| 121 | passed seed into the init structure. It is now fixed to copy 8. | ||
| 122 | My own suggestion is to used something like MD5 :-) | ||
| 123 | |||
| 124 | Version 3.19 | ||
| 125 | While looking at my code one day, I though, why do I keep on | ||
| 126 | calling des_encrypt(in,out,ks,enc) when every function that | ||
| 127 | calls it has in and out the same. So I dropped the 'out' | ||
| 128 | parameter, people should not be using this function. | ||
| 129 | |||
| 130 | Version 3.18 30/08/95 | ||
| 131 | Fixed a few bit with the distribution and the filenames. | ||
| 132 | 3.17 had been munged via a move to DOS and back again. | ||
| 133 | NO CODE CHANGES | ||
| 134 | |||
| 135 | Version 3.17 14/07/95 | ||
| 136 | Fixed ede3 cbc which I had broken in 3.16. I have also | ||
| 137 | removed some unneeded variables in 7-8 of the routines. | ||
| 138 | |||
| 139 | Version 3.16 26/06/95 | ||
| 140 | Added des_encrypt2() which does not use IP/FP, used by triple | ||
| 141 | des routines. Tweaked things a bit elsewhere. %13 speedup on | ||
| 142 | sparc and %6 on a R4400 for ede3 cbc mode. | ||
| 143 | |||
| 144 | Version 3.15 06/06/95 | ||
| 145 | Added des_ncbc_encrypt(), it is des_cbc mode except that it is | ||
| 146 | 'normal' and copies the new iv value back over the top of the | ||
| 147 | passed parameter. | ||
| 148 | CHANGED des_ede3_cbc_encrypt() so that it too now overwrites | ||
| 149 | the iv. THIS WILL BREAK EXISTING CODE, but since this function | ||
| 150 | only new, I feel I can change it, not so with des_cbc_encrypt :-(. | ||
| 151 | I need to update the documentation. | ||
| 152 | |||
| 153 | Version 3.14 31/05/95 | ||
| 154 | New release upon the world, as part of my SSL implementation. | ||
| 155 | New copyright and usage stuff. Basically free for all to use | ||
| 156 | as long as you say it came from me :-) | ||
| 157 | |||
| 158 | Version 3.13 31/05/95 | ||
| 159 | A fix in speed.c, if HZ is not defined, I set it to 100.0 | ||
| 160 | which is reasonable for most unixes except SunOS 4.x. | ||
| 161 | I now have a #ifdef sun but timing for SunOS 4.x looked very | ||
| 162 | good :-(. At my last job where I used SunOS 4.x, it was | ||
| 163 | defined to be 60.0 (look at the old INSTALL documentation), at | ||
| 164 | the last release had it changed to 100.0 since I now work with | ||
| 165 | Solaris2 and SVR4 boxes. | ||
| 166 | Thanks to Rory Chisholm <rchishol@math.ethz.ch> for pointing this | ||
| 167 | one out. | ||
| 168 | |||
| 169 | Version 3.12 08/05/95 | ||
| 170 | As pointed out by The Crypt Keeper <tck@bend.UCSD.EDU>, | ||
| 171 | my D_ENCRYPT macro in crypt() had an un-necessary variable. | ||
| 172 | It has been removed. | ||
| 173 | |||
| 174 | Version 3.11 03/05/95 | ||
| 175 | Added des_ede3_cbc_encrypt() which is cbc mode des with 3 keys | ||
| 176 | and one iv. It is a standard and I needed it for my SSL code. | ||
| 177 | It makes more sense to use this for triple DES than | ||
| 178 | 3cbc_encrypt(). I have also added (or should I say tested :-) | ||
| 179 | cfb64_encrypt() which is cfb64 but it will encrypt a partial | ||
| 180 | number of bytes - 3 bytes in 3 bytes out. Again this is for | ||
| 181 | my SSL library, as a form of encryption to use with SSL | ||
| 182 | telnet. | ||
| 183 | |||
| 184 | Version 3.10 22/03/95 | ||
| 185 | Fixed a bug in 3cbc_encrypt() :-(. When making repeated calls | ||
| 186 | to cbc3_encrypt, the 2 iv values that were being returned to | ||
| 187 | be used in the next call were reversed :-(. | ||
| 188 | Many thanks to Bill Wade <wade@Stoner.COM> for pointing out | ||
| 189 | this error. | ||
| 190 | |||
| 191 | Version 3.09 01/02/95 | ||
| 192 | Fixed des_random_key to far more random, it was rather feeble | ||
| 193 | with regards to picking the initial seed. The problem was | ||
| 194 | pointed out by Olaf Kirch <okir@monad.swb.de>. | ||
| 195 | |||
| 196 | Version 3.08 14/12/94 | ||
| 197 | Added Makefile.PL so libdes can be built into perl5. | ||
| 198 | Changed des_locl.h so RAND is always defined. | ||
| 199 | |||
| 200 | Version 3.07 05/12/94 | ||
| 201 | Added GNUmake and stuff so the library can be build with | ||
| 202 | glibc. | ||
| 203 | |||
| 204 | Version 3.06 30/08/94 | ||
| 205 | Added rpc_enc.c which contains _des_crypt. This is for use in | ||
| 206 | secure_rpc v 4.0 | ||
| 207 | Finally fixed the cfb_enc problems. | ||
| 208 | Fixed a few parameter parsing bugs in des (-3 and -b), thanks | ||
| 209 | to Rob McMillan <R.McMillan@its.gu.edu.au> | ||
| 210 | |||
| 211 | Version 3.05 21/04/94 | ||
| 212 | for unsigned long l; gcc does not produce ((l>>34) == 0) | ||
| 213 | This causes bugs in cfb_enc. | ||
| 214 | Thanks to Hadmut Danisch <danisch@ira.uka.de> | ||
| 215 | |||
| 216 | Version 3.04 20/04/94 | ||
| 217 | Added a version number to des.c and libdes.a | ||
| 218 | |||
| 219 | Version 3.03 12/01/94 | ||
| 220 | Fixed a bug in non zero iv in 3cbc_enc. | ||
| 221 | |||
| 222 | Version 3.02 29/10/93 | ||
| 223 | I now work in a place where there are 6+ architectures and 14+ | ||
| 224 | OS versions :-). | ||
| 225 | Fixed TERMIO definition so the most sys V boxes will work :-) | ||
| 226 | |||
| 227 | Release upon comp.sources.misc | ||
| 228 | Version 3.01 08/10/93 | ||
| 229 | Added des_3cbc_encrypt() | ||
| 230 | |||
| 231 | Version 3.00 07/10/93 | ||
| 232 | Fixed up documentation. | ||
| 233 | quad_cksum definitely compatible with MIT's now. | ||
| 234 | |||
| 235 | Version 2.30 24/08/93 | ||
| 236 | Triple DES now defaults to triple cbc but can do triple ecb | ||
| 237 | with the -b flag. | ||
| 238 | Fixed some MSDOS uuen/uudecoding problems, thanks to | ||
| 239 | Added prototypes. | ||
| 240 | |||
| 241 | Version 2.22 29/06/93 | ||
| 242 | Fixed a bug in des_is_weak_key() which stopped it working :-( | ||
| 243 | thanks to engineering@MorningStar.Com. | ||
| 244 | |||
| 245 | Version 2.21 03/06/93 | ||
| 246 | des(1) with no arguments gives quite a bit of help. | ||
| 247 | Added -c (generate ckecksum) flag to des(1). | ||
| 248 | Added -3 (triple DES) flag to des(1). | ||
| 249 | Added cfb and ofb routines to the library. | ||
| 250 | |||
| 251 | Version 2.20 11/03/93 | ||
| 252 | Added -u (uuencode) flag to des(1). | ||
| 253 | I have been playing with byte order in quad_cksum to make it | ||
| 254 | compatible with MIT's version. All I can say is avid this | ||
| 255 | function if possible since MIT's output is endian dependent. | ||
| 256 | |||
| 257 | Version 2.12 14/10/92 | ||
| 258 | Added MSDOS specific macro in ecb_encrypt which gives a %70 | ||
| 259 | speed up when the code is compiled with turbo C. | ||
| 260 | |||
| 261 | Version 2.11 12/10/92 | ||
| 262 | Speedup in set_key (recoding of PC-1) | ||
| 263 | I now do it in 47 simple operations, down from 60. | ||
| 264 | Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov) | ||
| 265 | for motivating me to look for a faster system :-) | ||
| 266 | The speedup is probably less that 1% but it is still 13 | ||
| 267 | instructions less :-). | ||
| 268 | |||
| 269 | Version 2.10 06/10/92 | ||
| 270 | The code now works on the 64bit ETA10 and CRAY without modifications or | ||
| 271 | #defines. I believe the code should work on any machine that | ||
| 272 | defines long, int or short to be 8 bytes long. | ||
| 273 | Thanks to Shabbir J. Safdar (shabby@mentor.cc.purdue.edu) | ||
| 274 | for helping me fix the code to run on 64bit machines (he had | ||
| 275 | access to an ETA10). | ||
| 276 | Thanks also to John Fletcher <john_fletcher@lccmail.ocf.llnl.gov> | ||
| 277 | for testing the routines on a CRAY. | ||
| 278 | read_password.c has been renamed to read_passwd.c | ||
| 279 | string_to_key.c has been renamed to string2key.c | ||
| 280 | |||
| 281 | Version 2.00 14/09/92 | ||
| 282 | Made mods so that the library should work on 64bit CPU's. | ||
| 283 | Removed all my uchar and ulong defs. To many different | ||
| 284 | versions of unix define them in their header files in too many | ||
| 285 | different combinations :-) | ||
| 286 | IRIX - Sillicon Graphics mods (mostly in read_password.c). | ||
| 287 | Thanks to Andrew Daviel (advax@erich.triumf.ca) | ||
| 288 | |||
| 289 | Version 1.99 26/08/92 | ||
| 290 | Fixed a bug or 2 in enc_read.c | ||
| 291 | Fixed a bug in enc_write.c | ||
| 292 | Fixed a pseudo bug in fcrypt.c (very obscure). | ||
| 293 | |||
| 294 | Version 1.98 31/07/92 | ||
| 295 | Support for the ETA10. This is a strange machine that defines | ||
| 296 | longs and ints as 8 bytes and shorts as 4 bytes. | ||
| 297 | Since I do evil things with long * that assume that they are 4 | ||
| 298 | bytes. Look in the Makefile for the option to compile for | ||
| 299 | this machine. quad_cksum appears to have problems but I | ||
| 300 | will don't have the time to fix it right now, and this is not | ||
| 301 | a function that uses DES and so will not effect the main uses | ||
| 302 | of the library. | ||
| 303 | |||
| 304 | Version 1.97 20/05/92 eay | ||
| 305 | Fixed the Imakefile and made some changes to des.h to fix some | ||
| 306 | problems when building this package with Kerberos v 4. | ||
| 307 | |||
| 308 | Version 1.96 18/05/92 eay | ||
| 309 | Fixed a small bug in string_to_key() where problems could | ||
| 310 | occur if des_check_key was set to true and the string | ||
| 311 | generated a weak key. | ||
| 312 | |||
| 313 | Patch2 posted to comp.sources.misc | ||
| 314 | Version 1.95 13/05/92 eay | ||
| 315 | Added an alternative version of the D_ENCRYPT macro in | ||
| 316 | ecb_encrypt and fcrypt. Depending on the compiler, one version or the | ||
| 317 | other will be faster. This was inspired by | ||
| 318 | Dana How <how@isl.stanford.edu>, and her pointers about doing the | ||
| 319 | *(ulong *)((uchar *)ptr+(value&0xfc)) | ||
| 320 | vs | ||
| 321 | ptr[value&0x3f] | ||
| 322 | to stop the C compiler doing a <<2 to convert the long array index. | ||
| 323 | |||
| 324 | Version 1.94 05/05/92 eay | ||
| 325 | Fixed an incompatibility between my string_to_key and the MIT | ||
| 326 | version. When the key is longer than 8 chars, I was wrapping | ||
| 327 | with a different method. To use the old version, define | ||
| 328 | OLD_STR_TO_KEY in the makefile. Thanks to | ||
| 329 | viktor@newsu.shearson.com (Viktor Dukhovni). | ||
| 330 | |||
| 331 | Version 1.93 28/04/92 eay | ||
| 332 | Fixed the VMS mods so that echo is now turned off in | ||
| 333 | read_password. Thanks again to brennan@coco.cchs.su.oz.AU. | ||
| 334 | MSDOS support added. The routines can be compiled with | ||
| 335 | Turbo C (v2.0) and MSC (v5.1). Make sure MSDOS is defined. | ||
| 336 | |||
| 337 | Patch1 posted to comp.sources.misc | ||
| 338 | Version 1.92 13/04/92 eay | ||
| 339 | Changed D_ENCRYPT so that the rotation of R occurs outside of | ||
| 340 | the loop. This required rotating all the longs in sp.h (now | ||
| 341 | called spr.h). Thanks to Richard Outerbridge <71755.204@CompuServe.COM> | ||
| 342 | speed.c has been changed so it will work without SIGALRM. If | ||
| 343 | times(3) is not present it will try to use ftime() instead. | ||
| 344 | |||
| 345 | Version 1.91 08/04/92 eay | ||
| 346 | Added -E/-D options to des(1) so it can use string_to_key. | ||
| 347 | Added SVR4 mods suggested by witr@rwwa.COM | ||
| 348 | Added VMS mods suggested by brennan@coco.cchs.su.oz.AU. If | ||
| 349 | anyone knows how to turn of tty echo in VMS please tell me or | ||
| 350 | implement it yourself :-). | ||
| 351 | Changed FILE *IN/*OUT to *DES_IN/*DES_OUT since it appears VMS | ||
| 352 | does not like IN/OUT being used. | ||
| 353 | |||
| 354 | Libdes posted to comp.sources.misc | ||
| 355 | Version 1.9 24/03/92 eay | ||
| 356 | Now contains a fast small crypt replacement. | ||
| 357 | Added des(1) command. | ||
| 358 | Added des_rw_mode so people can use cbc encryption with | ||
| 359 | enc_read and enc_write. | ||
| 360 | |||
| 361 | Version 1.8 15/10/91 eay | ||
| 362 | Bug in cbc_cksum. | ||
| 363 | Many thanks to Keith Reynolds (keithr@sco.COM) for pointing this | ||
| 364 | one out. | ||
| 365 | |||
| 366 | Version 1.7 24/09/91 eay | ||
| 367 | Fixed set_key :-) | ||
| 368 | set_key is 4 times faster and takes less space. | ||
| 369 | There are a few minor changes that could be made. | ||
| 370 | |||
| 371 | Version 1.6 19/09/1991 eay | ||
| 372 | Finally go IP and FP finished. | ||
| 373 | Now I need to fix set_key. | ||
| 374 | This version is quite a bit faster that 1.51 | ||
| 375 | |||
| 376 | Version 1.52 15/06/1991 eay | ||
| 377 | 20% speedup in ecb_encrypt by changing the E bit selection | ||
| 378 | to use 2 32bit words. This also required modification of the | ||
| 379 | sp table. There is still a way to speedup the IP and IP-1 | ||
| 380 | (hints from outer@sq.com) still working on this one :-(. | ||
| 381 | |||
| 382 | Version 1.51 07/06/1991 eay | ||
| 383 | Faster des_encrypt by loop unrolling | ||
| 384 | Fixed bug in quad_cksum.c (thanks to hughes@logos.ucs.indiana.edu) | ||
| 385 | |||
| 386 | Version 1.50 28/05/1991 eay | ||
| 387 | Optimised the code a bit more for the sparc. I have improved the | ||
| 388 | speed of the inner des_encrypt by speeding up the initial and | ||
| 389 | final permutations. | ||
| 390 | |||
| 391 | Version 1.40 23/10/1990 eay | ||
| 392 | Fixed des_random_key, it did not produce a random key :-( | ||
| 393 | |||
| 394 | Version 1.30 2/10/1990 eay | ||
| 395 | Have made des_quad_cksum the same as MIT's, the full package | ||
| 396 | should be compatible with MIT's | ||
| 397 | Have tested on a DECstation 3100 | ||
| 398 | Still need to fix des_set_key (make it faster). | ||
| 399 | Does des_cbc_encrypts at 70.5k/sec on a 3100. | ||
| 400 | |||
| 401 | Version 1.20 18/09/1990 eay | ||
| 402 | Fixed byte order dependencies. | ||
| 403 | Fixed (I hope) all the word alignment problems. | ||
| 404 | Speedup in des_ecb_encrypt. | ||
| 405 | |||
| 406 | Version 1.10 11/09/1990 eay | ||
| 407 | Added des_enc_read and des_enc_write. | ||
| 408 | Still need to fix des_quad_cksum. | ||
| 409 | Still need to document des_enc_read and des_enc_write. | ||
| 410 | |||
| 411 | Version 1.00 27/08/1990 eay | ||
| 412 | |||
diff --git a/src/lib/libssl/src/crypto/des/des_opts.c b/src/lib/libssl/src/crypto/des/des_opts.c deleted file mode 100644 index c713c5e319..0000000000 --- a/src/lib/libssl/src/crypto/des/des_opts.c +++ /dev/null | |||
| @@ -1,608 +0,0 @@ | |||
| 1 | /* crypto/des/des_opts.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* define PART1, PART2, PART3 or PART4 to build only with a few of the options. | ||
| 60 | * This is for machines with 64k code segment size restrictions. */ | ||
| 61 | |||
| 62 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 63 | #define TIMES | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #include <stdio.h> | ||
| 67 | #ifndef OPENSSL_SYS_MSDOS | ||
| 68 | #include <openssl/e_os2.h> | ||
| 69 | #include <unistd.h> | ||
| 70 | #else | ||
| 71 | #include <io.h> | ||
| 72 | extern void exit(); | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #ifndef OPENSSL_SYS_NETWARE | ||
| 76 | #include <signal.h> | ||
| 77 | #endif | ||
| 78 | |||
| 79 | #ifndef _IRIX | ||
| 80 | #include <time.h> | ||
| 81 | #endif | ||
| 82 | #ifdef TIMES | ||
| 83 | #include <sys/types.h> | ||
| 84 | #include <sys/times.h> | ||
| 85 | #endif | ||
| 86 | |||
| 87 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 88 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 89 | undefine TIMES, since that tells the rest of the program how things | ||
| 90 | should be handled. -- Richard Levitte */ | ||
| 91 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 92 | #undef TIMES | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef TIMES | ||
| 96 | #include <sys/timeb.h> | ||
| 97 | #endif | ||
| 98 | |||
| 99 | |||
| 100 | #if defined(sun) || defined(__ultrix) | ||
| 101 | #define _POSIX_SOURCE | ||
| 102 | #include <limits.h> | ||
| 103 | #include <sys/param.h> | ||
| 104 | #endif | ||
| 105 | |||
| 106 | #include <openssl/des.h> | ||
| 107 | #include "spr.h" | ||
| 108 | |||
| 109 | #define DES_DEFAULT_OPTIONS | ||
| 110 | |||
| 111 | #if !defined(PART1) && !defined(PART2) && !defined(PART3) && !defined(PART4) | ||
| 112 | #define PART1 | ||
| 113 | #define PART2 | ||
| 114 | #define PART3 | ||
| 115 | #define PART4 | ||
| 116 | #endif | ||
| 117 | |||
| 118 | #ifdef PART1 | ||
| 119 | |||
| 120 | #undef DES_UNROLL | ||
| 121 | #undef DES_RISC1 | ||
| 122 | #undef DES_RISC2 | ||
| 123 | #undef DES_PTR | ||
| 124 | #undef D_ENCRYPT | ||
| 125 | #define DES_encrypt1 des_encrypt_u4_cisc_idx | ||
| 126 | #define DES_encrypt2 des_encrypt2_u4_cisc_idx | ||
| 127 | #define DES_encrypt3 des_encrypt3_u4_cisc_idx | ||
| 128 | #define DES_decrypt3 des_decrypt3_u4_cisc_idx | ||
| 129 | #undef HEADER_DES_LOCL_H | ||
| 130 | #include "des_enc.c" | ||
| 131 | |||
| 132 | #define DES_UNROLL | ||
| 133 | #undef DES_RISC1 | ||
| 134 | #undef DES_RISC2 | ||
| 135 | #undef DES_PTR | ||
| 136 | #undef D_ENCRYPT | ||
| 137 | #undef DES_encrypt1 | ||
| 138 | #undef DES_encrypt2 | ||
| 139 | #undef DES_encrypt3 | ||
| 140 | #undef DES_decrypt3 | ||
| 141 | #define DES_encrypt1 des_encrypt_u16_cisc_idx | ||
| 142 | #define DES_encrypt2 des_encrypt2_u16_cisc_idx | ||
| 143 | #define DES_encrypt3 des_encrypt3_u16_cisc_idx | ||
| 144 | #define DES_decrypt3 des_decrypt3_u16_cisc_idx | ||
| 145 | #undef HEADER_DES_LOCL_H | ||
| 146 | #include "des_enc.c" | ||
| 147 | |||
| 148 | #undef DES_UNROLL | ||
| 149 | #define DES_RISC1 | ||
| 150 | #undef DES_RISC2 | ||
| 151 | #undef DES_PTR | ||
| 152 | #undef D_ENCRYPT | ||
| 153 | #undef DES_encrypt1 | ||
| 154 | #undef DES_encrypt2 | ||
| 155 | #undef DES_encrypt3 | ||
| 156 | #undef DES_decrypt3 | ||
| 157 | #define DES_encrypt1 des_encrypt_u4_risc1_idx | ||
| 158 | #define DES_encrypt2 des_encrypt2_u4_risc1_idx | ||
| 159 | #define DES_encrypt3 des_encrypt3_u4_risc1_idx | ||
| 160 | #define DES_decrypt3 des_decrypt3_u4_risc1_idx | ||
| 161 | #undef HEADER_DES_LOCL_H | ||
| 162 | #include "des_enc.c" | ||
| 163 | |||
| 164 | #endif | ||
| 165 | |||
| 166 | #ifdef PART2 | ||
| 167 | |||
| 168 | #undef DES_UNROLL | ||
| 169 | #undef DES_RISC1 | ||
| 170 | #define DES_RISC2 | ||
| 171 | #undef DES_PTR | ||
| 172 | #undef D_ENCRYPT | ||
| 173 | #undef DES_encrypt1 | ||
| 174 | #undef DES_encrypt2 | ||
| 175 | #undef DES_encrypt3 | ||
| 176 | #undef DES_decrypt3 | ||
| 177 | #define DES_encrypt1 des_encrypt_u4_risc2_idx | ||
| 178 | #define DES_encrypt2 des_encrypt2_u4_risc2_idx | ||
| 179 | #define DES_encrypt3 des_encrypt3_u4_risc2_idx | ||
| 180 | #define DES_decrypt3 des_decrypt3_u4_risc2_idx | ||
| 181 | #undef HEADER_DES_LOCL_H | ||
| 182 | #include "des_enc.c" | ||
| 183 | |||
| 184 | #define DES_UNROLL | ||
| 185 | #define DES_RISC1 | ||
| 186 | #undef DES_RISC2 | ||
| 187 | #undef DES_PTR | ||
| 188 | #undef D_ENCRYPT | ||
| 189 | #undef DES_encrypt1 | ||
| 190 | #undef DES_encrypt2 | ||
| 191 | #undef DES_encrypt3 | ||
| 192 | #undef DES_decrypt3 | ||
| 193 | #define DES_encrypt1 des_encrypt_u16_risc1_idx | ||
| 194 | #define DES_encrypt2 des_encrypt2_u16_risc1_idx | ||
| 195 | #define DES_encrypt3 des_encrypt3_u16_risc1_idx | ||
| 196 | #define DES_decrypt3 des_decrypt3_u16_risc1_idx | ||
| 197 | #undef HEADER_DES_LOCL_H | ||
| 198 | #include "des_enc.c" | ||
| 199 | |||
| 200 | #define DES_UNROLL | ||
| 201 | #undef DES_RISC1 | ||
| 202 | #define DES_RISC2 | ||
| 203 | #undef DES_PTR | ||
| 204 | #undef D_ENCRYPT | ||
| 205 | #undef DES_encrypt1 | ||
| 206 | #undef DES_encrypt2 | ||
| 207 | #undef DES_encrypt3 | ||
| 208 | #undef DES_decrypt3 | ||
| 209 | #define DES_encrypt1 des_encrypt_u16_risc2_idx | ||
| 210 | #define DES_encrypt2 des_encrypt2_u16_risc2_idx | ||
| 211 | #define DES_encrypt3 des_encrypt3_u16_risc2_idx | ||
| 212 | #define DES_decrypt3 des_decrypt3_u16_risc2_idx | ||
| 213 | #undef HEADER_DES_LOCL_H | ||
| 214 | #include "des_enc.c" | ||
| 215 | |||
| 216 | #endif | ||
| 217 | |||
| 218 | #ifdef PART3 | ||
| 219 | |||
| 220 | #undef DES_UNROLL | ||
| 221 | #undef DES_RISC1 | ||
| 222 | #undef DES_RISC2 | ||
| 223 | #define DES_PTR | ||
| 224 | #undef D_ENCRYPT | ||
| 225 | #undef DES_encrypt1 | ||
| 226 | #undef DES_encrypt2 | ||
| 227 | #undef DES_encrypt3 | ||
| 228 | #undef DES_decrypt3 | ||
| 229 | #define DES_encrypt1 des_encrypt_u4_cisc_ptr | ||
| 230 | #define DES_encrypt2 des_encrypt2_u4_cisc_ptr | ||
| 231 | #define DES_encrypt3 des_encrypt3_u4_cisc_ptr | ||
| 232 | #define DES_decrypt3 des_decrypt3_u4_cisc_ptr | ||
| 233 | #undef HEADER_DES_LOCL_H | ||
| 234 | #include "des_enc.c" | ||
| 235 | |||
| 236 | #define DES_UNROLL | ||
| 237 | #undef DES_RISC1 | ||
| 238 | #undef DES_RISC2 | ||
| 239 | #define DES_PTR | ||
| 240 | #undef D_ENCRYPT | ||
| 241 | #undef DES_encrypt1 | ||
| 242 | #undef DES_encrypt2 | ||
| 243 | #undef DES_encrypt3 | ||
| 244 | #undef DES_decrypt3 | ||
| 245 | #define DES_encrypt1 des_encrypt_u16_cisc_ptr | ||
| 246 | #define DES_encrypt2 des_encrypt2_u16_cisc_ptr | ||
| 247 | #define DES_encrypt3 des_encrypt3_u16_cisc_ptr | ||
| 248 | #define DES_decrypt3 des_decrypt3_u16_cisc_ptr | ||
| 249 | #undef HEADER_DES_LOCL_H | ||
| 250 | #include "des_enc.c" | ||
| 251 | |||
| 252 | #undef DES_UNROLL | ||
| 253 | #define DES_RISC1 | ||
| 254 | #undef DES_RISC2 | ||
| 255 | #define DES_PTR | ||
| 256 | #undef D_ENCRYPT | ||
| 257 | #undef DES_encrypt1 | ||
| 258 | #undef DES_encrypt2 | ||
| 259 | #undef DES_encrypt3 | ||
| 260 | #undef DES_decrypt3 | ||
| 261 | #define DES_encrypt1 des_encrypt_u4_risc1_ptr | ||
| 262 | #define DES_encrypt2 des_encrypt2_u4_risc1_ptr | ||
| 263 | #define DES_encrypt3 des_encrypt3_u4_risc1_ptr | ||
| 264 | #define DES_decrypt3 des_decrypt3_u4_risc1_ptr | ||
| 265 | #undef HEADER_DES_LOCL_H | ||
| 266 | #include "des_enc.c" | ||
| 267 | |||
| 268 | #endif | ||
| 269 | |||
| 270 | #ifdef PART4 | ||
| 271 | |||
| 272 | #undef DES_UNROLL | ||
| 273 | #undef DES_RISC1 | ||
| 274 | #define DES_RISC2 | ||
| 275 | #define DES_PTR | ||
| 276 | #undef D_ENCRYPT | ||
| 277 | #undef DES_encrypt1 | ||
| 278 | #undef DES_encrypt2 | ||
| 279 | #undef DES_encrypt3 | ||
| 280 | #undef DES_decrypt3 | ||
| 281 | #define DES_encrypt1 des_encrypt_u4_risc2_ptr | ||
| 282 | #define DES_encrypt2 des_encrypt2_u4_risc2_ptr | ||
| 283 | #define DES_encrypt3 des_encrypt3_u4_risc2_ptr | ||
| 284 | #define DES_decrypt3 des_decrypt3_u4_risc2_ptr | ||
| 285 | #undef HEADER_DES_LOCL_H | ||
| 286 | #include "des_enc.c" | ||
| 287 | |||
| 288 | #define DES_UNROLL | ||
| 289 | #define DES_RISC1 | ||
| 290 | #undef DES_RISC2 | ||
| 291 | #define DES_PTR | ||
| 292 | #undef D_ENCRYPT | ||
| 293 | #undef DES_encrypt1 | ||
| 294 | #undef DES_encrypt2 | ||
| 295 | #undef DES_encrypt3 | ||
| 296 | #undef DES_decrypt3 | ||
| 297 | #define DES_encrypt1 des_encrypt_u16_risc1_ptr | ||
| 298 | #define DES_encrypt2 des_encrypt2_u16_risc1_ptr | ||
| 299 | #define DES_encrypt3 des_encrypt3_u16_risc1_ptr | ||
| 300 | #define DES_decrypt3 des_decrypt3_u16_risc1_ptr | ||
| 301 | #undef HEADER_DES_LOCL_H | ||
| 302 | #include "des_enc.c" | ||
| 303 | |||
| 304 | #define DES_UNROLL | ||
| 305 | #undef DES_RISC1 | ||
| 306 | #define DES_RISC2 | ||
| 307 | #define DES_PTR | ||
| 308 | #undef D_ENCRYPT | ||
| 309 | #undef DES_encrypt1 | ||
| 310 | #undef DES_encrypt2 | ||
| 311 | #undef DES_encrypt3 | ||
| 312 | #undef DES_decrypt3 | ||
| 313 | #define DES_encrypt1 des_encrypt_u16_risc2_ptr | ||
| 314 | #define DES_encrypt2 des_encrypt2_u16_risc2_ptr | ||
| 315 | #define DES_encrypt3 des_encrypt3_u16_risc2_ptr | ||
| 316 | #define DES_decrypt3 des_decrypt3_u16_risc2_ptr | ||
| 317 | #undef HEADER_DES_LOCL_H | ||
| 318 | #include "des_enc.c" | ||
| 319 | |||
| 320 | #endif | ||
| 321 | |||
| 322 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 323 | #ifndef HZ | ||
| 324 | # ifndef CLK_TCK | ||
| 325 | # ifndef _BSD_CLK_TCK_ /* FreeBSD fix */ | ||
| 326 | # define HZ 100.0 | ||
| 327 | # else /* _BSD_CLK_TCK_ */ | ||
| 328 | # define HZ ((double)_BSD_CLK_TCK_) | ||
| 329 | # endif | ||
| 330 | # else /* CLK_TCK */ | ||
| 331 | # define HZ ((double)CLK_TCK) | ||
| 332 | # endif | ||
| 333 | #endif | ||
| 334 | |||
| 335 | #define BUFSIZE ((long)1024) | ||
| 336 | long run=0; | ||
| 337 | |||
| 338 | double Time_F(int s); | ||
| 339 | #ifdef SIGALRM | ||
| 340 | #if defined(__STDC__) || defined(sgi) | ||
| 341 | #define SIGRETTYPE void | ||
| 342 | #else | ||
| 343 | #define SIGRETTYPE int | ||
| 344 | #endif | ||
| 345 | |||
| 346 | SIGRETTYPE sig_done(int sig); | ||
| 347 | SIGRETTYPE sig_done(int sig) | ||
| 348 | { | ||
| 349 | signal(SIGALRM,sig_done); | ||
| 350 | run=0; | ||
| 351 | #ifdef LINT | ||
| 352 | sig=sig; | ||
| 353 | #endif | ||
| 354 | } | ||
| 355 | #endif | ||
| 356 | |||
| 357 | #define START 0 | ||
| 358 | #define STOP 1 | ||
| 359 | |||
| 360 | double Time_F(int s) | ||
| 361 | { | ||
| 362 | double ret; | ||
| 363 | #ifdef TIMES | ||
| 364 | static struct tms tstart,tend; | ||
| 365 | |||
| 366 | if (s == START) | ||
| 367 | { | ||
| 368 | times(&tstart); | ||
| 369 | return(0); | ||
| 370 | } | ||
| 371 | else | ||
| 372 | { | ||
| 373 | times(&tend); | ||
| 374 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 375 | return((ret == 0.0)?1e-6:ret); | ||
| 376 | } | ||
| 377 | #else /* !times() */ | ||
| 378 | static struct timeb tstart,tend; | ||
| 379 | long i; | ||
| 380 | |||
| 381 | if (s == START) | ||
| 382 | { | ||
| 383 | ftime(&tstart); | ||
| 384 | return(0); | ||
| 385 | } | ||
| 386 | else | ||
| 387 | { | ||
| 388 | ftime(&tend); | ||
| 389 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 390 | ret=((double)(tend.time-tstart.time))+((double)i)/1000.0; | ||
| 391 | return((ret == 0.0)?1e-6:ret); | ||
| 392 | } | ||
| 393 | #endif | ||
| 394 | } | ||
| 395 | |||
| 396 | #ifdef SIGALRM | ||
| 397 | #define print_name(name) fprintf(stderr,"Doing %s's for 10 seconds\n",name); alarm(10); | ||
| 398 | #else | ||
| 399 | #define print_name(name) fprintf(stderr,"Doing %s %ld times\n",name,cb); | ||
| 400 | #endif | ||
| 401 | |||
| 402 | #define time_it(func,name,index) \ | ||
| 403 | print_name(name); \ | ||
| 404 | Time_F(START); \ | ||
| 405 | for (count=0,run=1; COND(cb); count++) \ | ||
| 406 | { \ | ||
| 407 | unsigned long d[2]; \ | ||
| 408 | func(d,&sch,DES_ENCRYPT); \ | ||
| 409 | } \ | ||
| 410 | tm[index]=Time_F(STOP); \ | ||
| 411 | fprintf(stderr,"%ld %s's in %.2f second\n",count,name,tm[index]); \ | ||
| 412 | tm[index]=((double)COUNT(cb))/tm[index]; | ||
| 413 | |||
| 414 | #define print_it(name,index) \ | ||
| 415 | fprintf(stderr,"%s bytes per sec = %12.2f (%5.1fuS)\n",name, \ | ||
| 416 | tm[index]*8,1.0e6/tm[index]); | ||
| 417 | |||
| 418 | int main(int argc, char **argv) | ||
| 419 | { | ||
| 420 | long count; | ||
| 421 | static unsigned char buf[BUFSIZE]; | ||
| 422 | static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; | ||
| 423 | static DES_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12}; | ||
| 424 | static DES_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34}; | ||
| 425 | DES_key_schedule sch,sch2,sch3; | ||
| 426 | double d,tm[16],max=0; | ||
| 427 | int rank[16]; | ||
| 428 | char *str[16]; | ||
| 429 | int max_idx=0,i,num=0,j; | ||
| 430 | #ifndef SIGALARM | ||
| 431 | long ca,cb,cc,cd,ce; | ||
| 432 | #endif | ||
| 433 | |||
| 434 | for (i=0; i<12; i++) | ||
| 435 | { | ||
| 436 | tm[i]=0.0; | ||
| 437 | rank[i]=0; | ||
| 438 | } | ||
| 439 | |||
| 440 | #ifndef TIMES | ||
| 441 | fprintf(stderr,"To get the most accurate results, try to run this\n"); | ||
| 442 | fprintf(stderr,"program when this computer is idle.\n"); | ||
| 443 | #endif | ||
| 444 | |||
| 445 | DES_set_key_unchecked(&key,&sch); | ||
| 446 | DES_set_key_unchecked(&key2,&sch2); | ||
| 447 | DES_set_key_unchecked(&key3,&sch3); | ||
| 448 | |||
| 449 | #ifndef SIGALRM | ||
| 450 | fprintf(stderr,"First we calculate the approximate speed ...\n"); | ||
| 451 | DES_set_key_unchecked(&key,sch); | ||
| 452 | count=10; | ||
| 453 | do { | ||
| 454 | long i; | ||
| 455 | unsigned long data[2]; | ||
| 456 | |||
| 457 | count*=2; | ||
| 458 | Time_F(START); | ||
| 459 | for (i=count; i; i--) | ||
| 460 | DES_encrypt1(data,&(sch[0]),DES_ENCRYPT); | ||
| 461 | d=Time_F(STOP); | ||
| 462 | } while (d < 3.0); | ||
| 463 | ca=count; | ||
| 464 | cb=count*3; | ||
| 465 | cc=count*3*8/BUFSIZE+1; | ||
| 466 | cd=count*8/BUFSIZE+1; | ||
| 467 | |||
| 468 | ce=count/20+1; | ||
| 469 | #define COND(d) (count != (d)) | ||
| 470 | #define COUNT(d) (d) | ||
| 471 | #else | ||
| 472 | #define COND(c) (run) | ||
| 473 | #define COUNT(d) (count) | ||
| 474 | signal(SIGALRM,sig_done); | ||
| 475 | alarm(10); | ||
| 476 | #endif | ||
| 477 | |||
| 478 | #ifdef PART1 | ||
| 479 | time_it(des_encrypt_u4_cisc_idx, "des_encrypt_u4_cisc_idx ", 0); | ||
| 480 | time_it(des_encrypt_u16_cisc_idx, "des_encrypt_u16_cisc_idx ", 1); | ||
| 481 | time_it(des_encrypt_u4_risc1_idx, "des_encrypt_u4_risc1_idx ", 2); | ||
| 482 | num+=3; | ||
| 483 | #endif | ||
| 484 | #ifdef PART2 | ||
| 485 | time_it(des_encrypt_u16_risc1_idx,"des_encrypt_u16_risc1_idx", 3); | ||
| 486 | time_it(des_encrypt_u4_risc2_idx, "des_encrypt_u4_risc2_idx ", 4); | ||
| 487 | time_it(des_encrypt_u16_risc2_idx,"des_encrypt_u16_risc2_idx", 5); | ||
| 488 | num+=3; | ||
| 489 | #endif | ||
| 490 | #ifdef PART3 | ||
| 491 | time_it(des_encrypt_u4_cisc_ptr, "des_encrypt_u4_cisc_ptr ", 6); | ||
| 492 | time_it(des_encrypt_u16_cisc_ptr, "des_encrypt_u16_cisc_ptr ", 7); | ||
| 493 | time_it(des_encrypt_u4_risc1_ptr, "des_encrypt_u4_risc1_ptr ", 8); | ||
| 494 | num+=3; | ||
| 495 | #endif | ||
| 496 | #ifdef PART4 | ||
| 497 | time_it(des_encrypt_u16_risc1_ptr,"des_encrypt_u16_risc1_ptr", 9); | ||
| 498 | time_it(des_encrypt_u4_risc2_ptr, "des_encrypt_u4_risc2_ptr ",10); | ||
| 499 | time_it(des_encrypt_u16_risc2_ptr,"des_encrypt_u16_risc2_ptr",11); | ||
| 500 | num+=3; | ||
| 501 | #endif | ||
| 502 | |||
| 503 | #ifdef PART1 | ||
| 504 | str[0]=" 4 c i"; | ||
| 505 | print_it("des_encrypt_u4_cisc_idx ",0); | ||
| 506 | max=tm[0]; | ||
| 507 | max_idx=0; | ||
| 508 | str[1]="16 c i"; | ||
| 509 | print_it("des_encrypt_u16_cisc_idx ",1); | ||
| 510 | if (max < tm[1]) { max=tm[1]; max_idx=1; } | ||
| 511 | str[2]=" 4 r1 i"; | ||
| 512 | print_it("des_encrypt_u4_risc1_idx ",2); | ||
| 513 | if (max < tm[2]) { max=tm[2]; max_idx=2; } | ||
| 514 | #endif | ||
| 515 | #ifdef PART2 | ||
| 516 | str[3]="16 r1 i"; | ||
| 517 | print_it("des_encrypt_u16_risc1_idx",3); | ||
| 518 | if (max < tm[3]) { max=tm[3]; max_idx=3; } | ||
| 519 | str[4]=" 4 r2 i"; | ||
| 520 | print_it("des_encrypt_u4_risc2_idx ",4); | ||
| 521 | if (max < tm[4]) { max=tm[4]; max_idx=4; } | ||
| 522 | str[5]="16 r2 i"; | ||
| 523 | print_it("des_encrypt_u16_risc2_idx",5); | ||
| 524 | if (max < tm[5]) { max=tm[5]; max_idx=5; } | ||
| 525 | #endif | ||
| 526 | #ifdef PART3 | ||
| 527 | str[6]=" 4 c p"; | ||
| 528 | print_it("des_encrypt_u4_cisc_ptr ",6); | ||
| 529 | if (max < tm[6]) { max=tm[6]; max_idx=6; } | ||
| 530 | str[7]="16 c p"; | ||
| 531 | print_it("des_encrypt_u16_cisc_ptr ",7); | ||
| 532 | if (max < tm[7]) { max=tm[7]; max_idx=7; } | ||
| 533 | str[8]=" 4 r1 p"; | ||
| 534 | print_it("des_encrypt_u4_risc1_ptr ",8); | ||
| 535 | if (max < tm[8]) { max=tm[8]; max_idx=8; } | ||
| 536 | #endif | ||
| 537 | #ifdef PART4 | ||
| 538 | str[9]="16 r1 p"; | ||
| 539 | print_it("des_encrypt_u16_risc1_ptr",9); | ||
| 540 | if (max < tm[9]) { max=tm[9]; max_idx=9; } | ||
| 541 | str[10]=" 4 r2 p"; | ||
| 542 | print_it("des_encrypt_u4_risc2_ptr ",10); | ||
| 543 | if (max < tm[10]) { max=tm[10]; max_idx=10; } | ||
| 544 | str[11]="16 r2 p"; | ||
| 545 | print_it("des_encrypt_u16_risc2_ptr",11); | ||
| 546 | if (max < tm[11]) { max=tm[11]; max_idx=11; } | ||
| 547 | #endif | ||
| 548 | printf("options des ecb/s\n"); | ||
| 549 | printf("%s %12.2f 100.0%%\n",str[max_idx],tm[max_idx]); | ||
| 550 | d=tm[max_idx]; | ||
| 551 | tm[max_idx]= -2.0; | ||
| 552 | max= -1.0; | ||
| 553 | for (;;) | ||
| 554 | { | ||
| 555 | for (i=0; i<12; i++) | ||
| 556 | { | ||
| 557 | if (max < tm[i]) { max=tm[i]; j=i; } | ||
| 558 | } | ||
| 559 | if (max < 0.0) break; | ||
| 560 | printf("%s %12.2f %4.1f%%\n",str[j],tm[j],tm[j]/d*100.0); | ||
| 561 | tm[j]= -2.0; | ||
| 562 | max= -1.0; | ||
| 563 | } | ||
| 564 | |||
| 565 | switch (max_idx) | ||
| 566 | { | ||
| 567 | case 0: | ||
| 568 | printf("-DDES_DEFAULT_OPTIONS\n"); | ||
| 569 | break; | ||
| 570 | case 1: | ||
| 571 | printf("-DDES_UNROLL\n"); | ||
| 572 | break; | ||
| 573 | case 2: | ||
| 574 | printf("-DDES_RISC1\n"); | ||
| 575 | break; | ||
| 576 | case 3: | ||
| 577 | printf("-DDES_UNROLL -DDES_RISC1\n"); | ||
| 578 | break; | ||
| 579 | case 4: | ||
| 580 | printf("-DDES_RISC2\n"); | ||
| 581 | break; | ||
| 582 | case 5: | ||
| 583 | printf("-DDES_UNROLL -DDES_RISC2\n"); | ||
| 584 | break; | ||
| 585 | case 6: | ||
| 586 | printf("-DDES_PTR\n"); | ||
| 587 | break; | ||
| 588 | case 7: | ||
| 589 | printf("-DDES_UNROLL -DDES_PTR\n"); | ||
| 590 | break; | ||
| 591 | case 8: | ||
| 592 | printf("-DDES_RISC1 -DDES_PTR\n"); | ||
| 593 | break; | ||
| 594 | case 9: | ||
| 595 | printf("-DDES_UNROLL -DDES_RISC1 -DDES_PTR\n"); | ||
| 596 | break; | ||
| 597 | case 10: | ||
| 598 | printf("-DDES_RISC2 -DDES_PTR\n"); | ||
| 599 | break; | ||
| 600 | case 11: | ||
| 601 | printf("-DDES_UNROLL -DDES_RISC2 -DDES_PTR\n"); | ||
| 602 | break; | ||
| 603 | } | ||
| 604 | exit(0); | ||
| 605 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
| 606 | return(0); | ||
| 607 | #endif | ||
| 608 | } | ||
diff --git a/src/lib/libssl/src/crypto/des/options.txt b/src/lib/libssl/src/crypto/des/options.txt deleted file mode 100644 index 6e2b50f765..0000000000 --- a/src/lib/libssl/src/crypto/des/options.txt +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | Note that the UNROLL option makes the 'inner' des loop unroll all 16 rounds | ||
| 2 | instead of the default 4. | ||
| 3 | RISC1 and RISC2 are 2 alternatives for the inner loop and | ||
| 4 | PTR means to use pointers arithmatic instead of arrays. | ||
| 5 | |||
| 6 | FreeBSD - Pentium Pro 200mhz - gcc 2.7.2.2 - assembler 577,000 4620k/s | ||
| 7 | IRIX 6.2 - R10000 195mhz - cc (-O3 -n32) - UNROLL RISC2 PTR 496,000 3968k/s | ||
| 8 | solaris 2.5.1 usparc 167mhz?? - SC4.0 - UNROLL RISC1 PTR [1] 459,400 3672k/s | ||
| 9 | FreeBSD - Pentium Pro 200mhz - gcc 2.7.2.2 - UNROLL RISC1 433,000 3468k/s | ||
| 10 | solaris 2.5.1 usparc 167mhz?? - gcc 2.7.2 - UNROLL 380,000 3041k/s | ||
| 11 | linux - pentium 100mhz - gcc 2.7.0 - assembler 281,000 2250k/s | ||
| 12 | NT 4.0 - pentium 100mhz - VC 4.2 - assembler 281,000 2250k/s | ||
| 13 | AIX 4.1? - PPC604 100mhz - cc - UNROLL 275,000 2200k/s | ||
| 14 | IRIX 5.3 - R4400 200mhz - gcc 2.6.3 - UNROLL RISC2 PTR 235,300 1882k/s | ||
| 15 | IRIX 5.3 - R4400 200mhz - cc - UNROLL RISC2 PTR 233,700 1869k/s | ||
| 16 | NT 4.0 - pentium 100mhz - VC 4.2 - UNROLL RISC1 PTR 191,000 1528k/s | ||
| 17 | DEC Alpha 165mhz?? - cc - RISC2 PTR [2] 181,000 1448k/s | ||
| 18 | linux - pentium 100mhz - gcc 2.7.0 - UNROLL RISC1 PTR 158,500 1268k/s | ||
| 19 | HPUX 10 - 9000/887 - cc - UNROLL [3] 148,000 1190k/s | ||
| 20 | solaris 2.5.1 - sparc 10 50mhz - gcc 2.7.2 - UNROLL 123,600 989k/s | ||
| 21 | IRIX 5.3 - R4000 100mhz - cc - UNROLL RISC2 PTR 101,000 808k/s | ||
| 22 | DGUX - 88100 50mhz(?) - gcc 2.6.3 - UNROLL 81,000 648k/s | ||
| 23 | solaris 2.4 486 50mhz - gcc 2.6.3 - assembler 65,000 522k/s | ||
| 24 | HPUX 10 - 9000/887 - k&r cc (default compiler) - UNROLL PTR 76,000 608k/s | ||
| 25 | solaris 2.4 486 50mhz - gcc 2.6.3 - UNROLL RISC2 43,500 344k/s | ||
| 26 | AIX - old slow one :-) - cc - 39,000 312k/s | ||
| 27 | |||
| 28 | Notes. | ||
| 29 | [1] For the ultra sparc, SunC 4.0 | ||
| 30 | cc -xtarget=ultra -xarch=v8plus -Xa -xO5, running 'des_opts' | ||
| 31 | gives a speed of 344,000 des/s while 'speed' gives 459,000 des/s. | ||
| 32 | I'll record the higher since it is coming from the library but it | ||
| 33 | is all rather weird. | ||
| 34 | [2] Similar to the ultra sparc ([1]), 181,000 for 'des_opts' vs 175,000. | ||
| 35 | [3] I was unable to get access to this machine when it was not heavily loaded. | ||
| 36 | As such, my timing program was never able to get more that %30 of the CPU. | ||
| 37 | This would cause the program to give much lower speed numbers because | ||
| 38 | it would be 'fighting' to stay in the cache with the other CPU burning | ||
| 39 | processes. | ||
diff --git a/src/lib/libssl/src/crypto/idea/idea_spd.c b/src/lib/libssl/src/crypto/idea/idea_spd.c deleted file mode 100644 index 7905b77926..0000000000 --- a/src/lib/libssl/src/crypto/idea/idea_spd.c +++ /dev/null | |||
| @@ -1,298 +0,0 @@ | |||
| 1 | /* crypto/idea/idea_spd.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ | ||
| 60 | /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ | ||
| 61 | |||
| 62 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 63 | #define TIMES | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #include <stdio.h> | ||
| 67 | |||
| 68 | #include <openssl/e_os2.h> | ||
| 69 | #include <unistd.h> | ||
| 70 | |||
| 71 | #ifndef OPENSSL_SYS_NETWARE | ||
| 72 | #include <signal.h> | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #ifndef _IRIX | ||
| 76 | #include <time.h> | ||
| 77 | #endif | ||
| 78 | #ifdef TIMES | ||
| 79 | #include <sys/types.h> | ||
| 80 | #include <sys/times.h> | ||
| 81 | #endif | ||
| 82 | |||
| 83 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 84 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 85 | undefine TIMES, since that tells the rest of the program how things | ||
| 86 | should be handled. -- Richard Levitte */ | ||
| 87 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 88 | #undef TIMES | ||
| 89 | #endif | ||
| 90 | |||
| 91 | #ifndef TIMES | ||
| 92 | #include <sys/timeb.h> | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #if defined(sun) || defined(__ultrix) | ||
| 96 | #define _POSIX_SOURCE | ||
| 97 | #include <limits.h> | ||
| 98 | #include <sys/param.h> | ||
| 99 | #endif | ||
| 100 | |||
| 101 | #include <openssl/idea.h> | ||
| 102 | |||
| 103 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 104 | #ifndef HZ | ||
| 105 | #ifndef CLK_TCK | ||
| 106 | #define HZ 100.0 | ||
| 107 | #else /* CLK_TCK */ | ||
| 108 | #define HZ ((double)CLK_TCK) | ||
| 109 | #endif | ||
| 110 | #endif | ||
| 111 | |||
| 112 | #define BUFSIZE ((long)1024) | ||
| 113 | long run=0; | ||
| 114 | |||
| 115 | double Time_F(int s); | ||
| 116 | #ifdef SIGALRM | ||
| 117 | #if defined(__STDC__) || defined(sgi) || defined(_AIX) | ||
| 118 | #define SIGRETTYPE void | ||
| 119 | #else | ||
| 120 | #define SIGRETTYPE int | ||
| 121 | #endif | ||
| 122 | |||
| 123 | SIGRETTYPE sig_done(int sig); | ||
| 124 | SIGRETTYPE sig_done(int sig) | ||
| 125 | { | ||
| 126 | signal(SIGALRM,sig_done); | ||
| 127 | run=0; | ||
| 128 | #ifdef LINT | ||
| 129 | sig=sig; | ||
| 130 | #endif | ||
| 131 | } | ||
| 132 | #endif | ||
| 133 | |||
| 134 | #define START 0 | ||
| 135 | #define STOP 1 | ||
| 136 | |||
| 137 | double Time_F(int s) | ||
| 138 | { | ||
| 139 | double ret; | ||
| 140 | #ifdef TIMES | ||
| 141 | static struct tms tstart,tend; | ||
| 142 | |||
| 143 | if (s == START) | ||
| 144 | { | ||
| 145 | times(&tstart); | ||
| 146 | return(0); | ||
| 147 | } | ||
| 148 | else | ||
| 149 | { | ||
| 150 | times(&tend); | ||
| 151 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 152 | return((ret == 0.0)?1e-6:ret); | ||
| 153 | } | ||
| 154 | #else /* !times() */ | ||
| 155 | static struct timeb tstart,tend; | ||
| 156 | long i; | ||
| 157 | |||
| 158 | if (s == START) | ||
| 159 | { | ||
| 160 | ftime(&tstart); | ||
| 161 | return(0); | ||
| 162 | } | ||
| 163 | else | ||
| 164 | { | ||
| 165 | ftime(&tend); | ||
| 166 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 167 | ret=((double)(tend.time-tstart.time))+((double)i)/1e3; | ||
| 168 | return((ret == 0.0)?1e-6:ret); | ||
| 169 | } | ||
| 170 | #endif | ||
| 171 | } | ||
| 172 | |||
| 173 | int main(int argc, char **argv) | ||
| 174 | { | ||
| 175 | long count; | ||
| 176 | static unsigned char buf[BUFSIZE]; | ||
| 177 | static unsigned char key[] ={ | ||
| 178 | 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, | ||
| 179 | 0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10, | ||
| 180 | }; | ||
| 181 | IDEA_KEY_SCHEDULE sch; | ||
| 182 | double a,aa,b,c,d; | ||
| 183 | #ifndef SIGALRM | ||
| 184 | long ca,cca,cb,cc; | ||
| 185 | #endif | ||
| 186 | |||
| 187 | #ifndef TIMES | ||
| 188 | printf("To get the most accurate results, try to run this\n"); | ||
| 189 | printf("program when this computer is idle.\n"); | ||
| 190 | #endif | ||
| 191 | |||
| 192 | #ifndef SIGALRM | ||
| 193 | printf("First we calculate the approximate speed ...\n"); | ||
| 194 | idea_set_encrypt_key(key,&sch); | ||
| 195 | count=10; | ||
| 196 | do { | ||
| 197 | long i; | ||
| 198 | IDEA_INT data[2]; | ||
| 199 | |||
| 200 | count*=2; | ||
| 201 | Time_F(START); | ||
| 202 | for (i=count; i; i--) | ||
| 203 | idea_encrypt(data,&sch); | ||
| 204 | d=Time_F(STOP); | ||
| 205 | } while (d < 3.0); | ||
| 206 | ca=count/4; | ||
| 207 | cca=count/200; | ||
| 208 | cb=count; | ||
| 209 | cc=count*8/BUFSIZE+1; | ||
| 210 | printf("idea_set_encrypt_key %ld times\n",ca); | ||
| 211 | #define COND(d) (count <= (d)) | ||
| 212 | #define COUNT(d) (d) | ||
| 213 | #else | ||
| 214 | #define COND(c) (run) | ||
| 215 | #define COUNT(d) (count) | ||
| 216 | signal(SIGALRM,sig_done); | ||
| 217 | printf("Doing idea_set_encrypt_key for 10 seconds\n"); | ||
| 218 | alarm(10); | ||
| 219 | #endif | ||
| 220 | |||
| 221 | Time_F(START); | ||
| 222 | for (count=0,run=1; COND(ca); count+=4) | ||
| 223 | { | ||
| 224 | idea_set_encrypt_key(key,&sch); | ||
| 225 | idea_set_encrypt_key(key,&sch); | ||
| 226 | idea_set_encrypt_key(key,&sch); | ||
| 227 | idea_set_encrypt_key(key,&sch); | ||
| 228 | } | ||
| 229 | d=Time_F(STOP); | ||
| 230 | printf("%ld idea idea_set_encrypt_key's in %.2f seconds\n",count,d); | ||
| 231 | a=((double)COUNT(ca))/d; | ||
| 232 | |||
| 233 | #ifdef SIGALRM | ||
| 234 | printf("Doing idea_set_decrypt_key for 10 seconds\n"); | ||
| 235 | alarm(10); | ||
| 236 | #else | ||
| 237 | printf("Doing idea_set_decrypt_key %ld times\n",cca); | ||
| 238 | #endif | ||
| 239 | |||
| 240 | Time_F(START); | ||
| 241 | for (count=0,run=1; COND(cca); count+=4) | ||
| 242 | { | ||
| 243 | idea_set_decrypt_key(&sch,&sch); | ||
| 244 | idea_set_decrypt_key(&sch,&sch); | ||
| 245 | idea_set_decrypt_key(&sch,&sch); | ||
| 246 | idea_set_decrypt_key(&sch,&sch); | ||
| 247 | } | ||
| 248 | d=Time_F(STOP); | ||
| 249 | printf("%ld idea idea_set_decrypt_key's in %.2f seconds\n",count,d); | ||
| 250 | aa=((double)COUNT(cca))/d; | ||
| 251 | |||
| 252 | #ifdef SIGALRM | ||
| 253 | printf("Doing idea_encrypt's for 10 seconds\n"); | ||
| 254 | alarm(10); | ||
| 255 | #else | ||
| 256 | printf("Doing idea_encrypt %ld times\n",cb); | ||
| 257 | #endif | ||
| 258 | Time_F(START); | ||
| 259 | for (count=0,run=1; COND(cb); count+=4) | ||
| 260 | { | ||
| 261 | unsigned long data[2]; | ||
| 262 | |||
| 263 | idea_encrypt(data,&sch); | ||
| 264 | idea_encrypt(data,&sch); | ||
| 265 | idea_encrypt(data,&sch); | ||
| 266 | idea_encrypt(data,&sch); | ||
| 267 | } | ||
| 268 | d=Time_F(STOP); | ||
| 269 | printf("%ld idea_encrypt's in %.2f second\n",count,d); | ||
| 270 | b=((double)COUNT(cb)*8)/d; | ||
| 271 | |||
| 272 | #ifdef SIGALRM | ||
| 273 | printf("Doing idea_cbc_encrypt on %ld byte blocks for 10 seconds\n", | ||
| 274 | BUFSIZE); | ||
| 275 | alarm(10); | ||
| 276 | #else | ||
| 277 | printf("Doing idea_cbc_encrypt %ld times on %ld byte blocks\n",cc, | ||
| 278 | BUFSIZE); | ||
| 279 | #endif | ||
| 280 | Time_F(START); | ||
| 281 | for (count=0,run=1; COND(cc); count++) | ||
| 282 | idea_cbc_encrypt(buf,buf,BUFSIZE,&sch, | ||
| 283 | &(key[0]),IDEA_ENCRYPT); | ||
| 284 | d=Time_F(STOP); | ||
| 285 | printf("%ld idea_cbc_encrypt's of %ld byte blocks in %.2f second\n", | ||
| 286 | count,BUFSIZE,d); | ||
| 287 | c=((double)COUNT(cc)*BUFSIZE)/d; | ||
| 288 | |||
| 289 | printf("IDEA set_encrypt_key per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a); | ||
| 290 | printf("IDEA set_decrypt_key per sec = %12.2f (%9.3fuS)\n",aa,1.0e6/aa); | ||
| 291 | printf("IDEA raw ecb bytes per sec = %12.2f (%9.3fuS)\n",b,8.0e6/b); | ||
| 292 | printf("IDEA cbc bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c); | ||
| 293 | exit(0); | ||
| 294 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
| 295 | return(0); | ||
| 296 | #endif | ||
| 297 | } | ||
| 298 | |||
diff --git a/src/lib/libssl/src/crypto/idea/version b/src/lib/libssl/src/crypto/idea/version deleted file mode 100644 index 3f22293795..0000000000 --- a/src/lib/libssl/src/crypto/idea/version +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | 1.1 07/12/95 - eay | ||
| 2 | Many thanks to Rhys Weatherley <rweather@us.oracle.com> | ||
| 3 | for pointing out that I was assuming little endian byte | ||
| 4 | order for all quantities what idea actually used | ||
| 5 | bigendian. No where in the spec does it mention | ||
| 6 | this, it is all in terms of 16 bit numbers and even the example | ||
| 7 | does not use byte streams for the input example :-(. | ||
| 8 | If you byte swap each pair of input, keys and iv, the functions | ||
| 9 | would produce the output as the old version :-(. | ||
| 10 | |||
| 11 | 1.0 ??/??/95 - eay | ||
| 12 | First version. | ||
diff --git a/src/lib/libssl/src/crypto/lhash/num.pl b/src/lib/libssl/src/crypto/lhash/num.pl deleted file mode 100644 index 30fedf9cd5..0000000000 --- a/src/lib/libssl/src/crypto/lhash/num.pl +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | #!/usr/local/bin/perl | ||
| 2 | |||
| 3 | #node 10 -> 4 | ||
| 4 | |||
| 5 | while (<>) | ||
| 6 | { | ||
| 7 | next unless /^node/; | ||
| 8 | chop; | ||
| 9 | @a=split; | ||
| 10 | $num{$a[3]}++; | ||
| 11 | } | ||
| 12 | |||
| 13 | @a=sort {$a <=> $b } keys %num; | ||
| 14 | foreach (0 .. $a[$#a]) | ||
| 15 | { | ||
| 16 | printf "%4d:%4d\n",$_,$num{$_}; | ||
| 17 | } | ||
diff --git a/src/lib/libssl/src/crypto/rc2/rc2speed.c b/src/lib/libssl/src/crypto/rc2/rc2speed.c deleted file mode 100644 index 1c90ca3e36..0000000000 --- a/src/lib/libssl/src/crypto/rc2/rc2speed.c +++ /dev/null | |||
| @@ -1,276 +0,0 @@ | |||
| 1 | /* crypto/rc2/rc2speed.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ | ||
| 60 | /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ | ||
| 61 | |||
| 62 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 63 | #define TIMES | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #include <stdio.h> | ||
| 67 | |||
| 68 | #include <openssl/e_os2.h> | ||
| 69 | #include <unistd.h> | ||
| 70 | |||
| 71 | #ifndef OPENSSL_SYS_NETWARE | ||
| 72 | #include <signal.h> | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #ifndef _IRIX | ||
| 76 | #include <time.h> | ||
| 77 | #endif | ||
| 78 | #ifdef TIMES | ||
| 79 | #include <sys/types.h> | ||
| 80 | #include <sys/times.h> | ||
| 81 | #endif | ||
| 82 | |||
| 83 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 84 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 85 | undefine TIMES, since that tells the rest of the program how things | ||
| 86 | should be handled. -- Richard Levitte */ | ||
| 87 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 88 | #undef TIMES | ||
| 89 | #endif | ||
| 90 | |||
| 91 | #ifndef TIMES | ||
| 92 | #include <sys/timeb.h> | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #if defined(sun) || defined(__ultrix) | ||
| 96 | #define _POSIX_SOURCE | ||
| 97 | #include <limits.h> | ||
| 98 | #include <sys/param.h> | ||
| 99 | #endif | ||
| 100 | |||
| 101 | #include <openssl/rc2.h> | ||
| 102 | |||
| 103 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 104 | #ifndef HZ | ||
| 105 | #ifndef CLK_TCK | ||
| 106 | #define HZ 100.0 | ||
| 107 | #else /* CLK_TCK */ | ||
| 108 | #define HZ ((double)CLK_TCK) | ||
| 109 | #endif /* CLK_TCK */ | ||
| 110 | #endif /* HZ */ | ||
| 111 | |||
| 112 | #define BUFSIZE ((long)1024) | ||
| 113 | long run=0; | ||
| 114 | |||
| 115 | double Time_F(int s); | ||
| 116 | #ifdef SIGALRM | ||
| 117 | #if defined(__STDC__) || defined(sgi) || defined(_AIX) | ||
| 118 | #define SIGRETTYPE void | ||
| 119 | #else | ||
| 120 | #define SIGRETTYPE int | ||
| 121 | #endif | ||
| 122 | |||
| 123 | SIGRETTYPE sig_done(int sig); | ||
| 124 | SIGRETTYPE sig_done(int sig) | ||
| 125 | { | ||
| 126 | signal(SIGALRM,sig_done); | ||
| 127 | run=0; | ||
| 128 | #ifdef LINT | ||
| 129 | sig=sig; | ||
| 130 | #endif | ||
| 131 | } | ||
| 132 | #endif | ||
| 133 | |||
| 134 | #define START 0 | ||
| 135 | #define STOP 1 | ||
| 136 | |||
| 137 | double Time_F(int s) | ||
| 138 | { | ||
| 139 | double ret; | ||
| 140 | #ifdef TIMES | ||
| 141 | static struct tms tstart,tend; | ||
| 142 | |||
| 143 | if (s == START) | ||
| 144 | { | ||
| 145 | times(&tstart); | ||
| 146 | return(0); | ||
| 147 | } | ||
| 148 | else | ||
| 149 | { | ||
| 150 | times(&tend); | ||
| 151 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 152 | return((ret == 0.0)?1e-6:ret); | ||
| 153 | } | ||
| 154 | #else /* !times() */ | ||
| 155 | static struct timeb tstart,tend; | ||
| 156 | long i; | ||
| 157 | |||
| 158 | if (s == START) | ||
| 159 | { | ||
| 160 | ftime(&tstart); | ||
| 161 | return(0); | ||
| 162 | } | ||
| 163 | else | ||
| 164 | { | ||
| 165 | ftime(&tend); | ||
| 166 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 167 | ret=((double)(tend.time-tstart.time))+((double)i)/1e3; | ||
| 168 | return((ret == 0.0)?1e-6:ret); | ||
| 169 | } | ||
| 170 | #endif | ||
| 171 | } | ||
| 172 | |||
| 173 | int main(int argc, char **argv) | ||
| 174 | { | ||
| 175 | long count; | ||
| 176 | static unsigned char buf[BUFSIZE]; | ||
| 177 | static unsigned char key[] ={ | ||
| 178 | 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, | ||
| 179 | 0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10, | ||
| 180 | }; | ||
| 181 | RC2_KEY sch; | ||
| 182 | double a,b,c,d; | ||
| 183 | #ifndef SIGALRM | ||
| 184 | long ca,cb,cc; | ||
| 185 | #endif | ||
| 186 | |||
| 187 | #ifndef TIMES | ||
| 188 | printf("To get the most accurate results, try to run this\n"); | ||
| 189 | printf("program when this computer is idle.\n"); | ||
| 190 | #endif | ||
| 191 | |||
| 192 | #ifndef SIGALRM | ||
| 193 | printf("First we calculate the approximate speed ...\n"); | ||
| 194 | RC2_set_key(&sch,16,key,128); | ||
| 195 | count=10; | ||
| 196 | do { | ||
| 197 | long i; | ||
| 198 | unsigned long data[2]; | ||
| 199 | |||
| 200 | count*=2; | ||
| 201 | Time_F(START); | ||
| 202 | for (i=count; i; i--) | ||
| 203 | RC2_encrypt(data,&sch); | ||
| 204 | d=Time_F(STOP); | ||
| 205 | } while (d < 3.0); | ||
| 206 | ca=count/512; | ||
| 207 | cb=count; | ||
| 208 | cc=count*8/BUFSIZE+1; | ||
| 209 | printf("Doing RC2_set_key %ld times\n",ca); | ||
| 210 | #define COND(d) (count != (d)) | ||
| 211 | #define COUNT(d) (d) | ||
| 212 | #else | ||
| 213 | #define COND(c) (run) | ||
| 214 | #define COUNT(d) (count) | ||
| 215 | signal(SIGALRM,sig_done); | ||
| 216 | printf("Doing RC2_set_key for 10 seconds\n"); | ||
| 217 | alarm(10); | ||
| 218 | #endif | ||
| 219 | |||
| 220 | Time_F(START); | ||
| 221 | for (count=0,run=1; COND(ca); count+=4) | ||
| 222 | { | ||
| 223 | RC2_set_key(&sch,16,key,128); | ||
| 224 | RC2_set_key(&sch,16,key,128); | ||
| 225 | RC2_set_key(&sch,16,key,128); | ||
| 226 | RC2_set_key(&sch,16,key,128); | ||
| 227 | } | ||
| 228 | d=Time_F(STOP); | ||
| 229 | printf("%ld RC2_set_key's in %.2f seconds\n",count,d); | ||
| 230 | a=((double)COUNT(ca))/d; | ||
| 231 | |||
| 232 | #ifdef SIGALRM | ||
| 233 | printf("Doing RC2_encrypt's for 10 seconds\n"); | ||
| 234 | alarm(10); | ||
| 235 | #else | ||
| 236 | printf("Doing RC2_encrypt %ld times\n",cb); | ||
| 237 | #endif | ||
| 238 | Time_F(START); | ||
| 239 | for (count=0,run=1; COND(cb); count+=4) | ||
| 240 | { | ||
| 241 | unsigned long data[2]; | ||
| 242 | |||
| 243 | RC2_encrypt(data,&sch); | ||
| 244 | RC2_encrypt(data,&sch); | ||
| 245 | RC2_encrypt(data,&sch); | ||
| 246 | RC2_encrypt(data,&sch); | ||
| 247 | } | ||
| 248 | d=Time_F(STOP); | ||
| 249 | printf("%ld RC2_encrypt's in %.2f second\n",count,d); | ||
| 250 | b=((double)COUNT(cb)*8)/d; | ||
| 251 | |||
| 252 | #ifdef SIGALRM | ||
| 253 | printf("Doing RC2_cbc_encrypt on %ld byte blocks for 10 seconds\n", | ||
| 254 | BUFSIZE); | ||
| 255 | alarm(10); | ||
| 256 | #else | ||
| 257 | printf("Doing RC2_cbc_encrypt %ld times on %ld byte blocks\n",cc, | ||
| 258 | BUFSIZE); | ||
| 259 | #endif | ||
| 260 | Time_F(START); | ||
| 261 | for (count=0,run=1; COND(cc); count++) | ||
| 262 | RC2_cbc_encrypt(buf,buf,BUFSIZE,&sch, | ||
| 263 | &(key[0]),RC2_ENCRYPT); | ||
| 264 | d=Time_F(STOP); | ||
| 265 | printf("%ld RC2_cbc_encrypt's of %ld byte blocks in %.2f second\n", | ||
| 266 | count,BUFSIZE,d); | ||
| 267 | c=((double)COUNT(cc)*BUFSIZE)/d; | ||
| 268 | |||
| 269 | printf("RC2 set_key per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a); | ||
| 270 | printf("RC2 raw ecb bytes per sec = %12.2f (%9.3fuS)\n",b,8.0e6/b); | ||
| 271 | printf("RC2 cbc bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c); | ||
| 272 | exit(0); | ||
| 273 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
| 274 | return(0); | ||
| 275 | #endif | ||
| 276 | } | ||
diff --git a/src/lib/libssl/src/crypto/rc2/tab.c b/src/lib/libssl/src/crypto/rc2/tab.c deleted file mode 100644 index 25dc14eeba..0000000000 --- a/src/lib/libssl/src/crypto/rc2/tab.c +++ /dev/null | |||
| @@ -1,86 +0,0 @@ | |||
| 1 | #include <stdio.h> | ||
| 2 | |||
| 3 | unsigned char ebits_to_num[256]={ | ||
| 4 | 0xbd,0x56,0xea,0xf2,0xa2,0xf1,0xac,0x2a, | ||
| 5 | 0xb0,0x93,0xd1,0x9c,0x1b,0x33,0xfd,0xd0, | ||
| 6 | 0x30,0x04,0xb6,0xdc,0x7d,0xdf,0x32,0x4b, | ||
| 7 | 0xf7,0xcb,0x45,0x9b,0x31,0xbb,0x21,0x5a, | ||
| 8 | 0x41,0x9f,0xe1,0xd9,0x4a,0x4d,0x9e,0xda, | ||
| 9 | 0xa0,0x68,0x2c,0xc3,0x27,0x5f,0x80,0x36, | ||
| 10 | 0x3e,0xee,0xfb,0x95,0x1a,0xfe,0xce,0xa8, | ||
| 11 | 0x34,0xa9,0x13,0xf0,0xa6,0x3f,0xd8,0x0c, | ||
| 12 | 0x78,0x24,0xaf,0x23,0x52,0xc1,0x67,0x17, | ||
| 13 | 0xf5,0x66,0x90,0xe7,0xe8,0x07,0xb8,0x60, | ||
| 14 | 0x48,0xe6,0x1e,0x53,0xf3,0x92,0xa4,0x72, | ||
| 15 | 0x8c,0x08,0x15,0x6e,0x86,0x00,0x84,0xfa, | ||
| 16 | 0xf4,0x7f,0x8a,0x42,0x19,0xf6,0xdb,0xcd, | ||
| 17 | 0x14,0x8d,0x50,0x12,0xba,0x3c,0x06,0x4e, | ||
| 18 | 0xec,0xb3,0x35,0x11,0xa1,0x88,0x8e,0x2b, | ||
| 19 | 0x94,0x99,0xb7,0x71,0x74,0xd3,0xe4,0xbf, | ||
| 20 | 0x3a,0xde,0x96,0x0e,0xbc,0x0a,0xed,0x77, | ||
| 21 | 0xfc,0x37,0x6b,0x03,0x79,0x89,0x62,0xc6, | ||
| 22 | 0xd7,0xc0,0xd2,0x7c,0x6a,0x8b,0x22,0xa3, | ||
| 23 | 0x5b,0x05,0x5d,0x02,0x75,0xd5,0x61,0xe3, | ||
| 24 | 0x18,0x8f,0x55,0x51,0xad,0x1f,0x0b,0x5e, | ||
| 25 | 0x85,0xe5,0xc2,0x57,0x63,0xca,0x3d,0x6c, | ||
| 26 | 0xb4,0xc5,0xcc,0x70,0xb2,0x91,0x59,0x0d, | ||
| 27 | 0x47,0x20,0xc8,0x4f,0x58,0xe0,0x01,0xe2, | ||
| 28 | 0x16,0x38,0xc4,0x6f,0x3b,0x0f,0x65,0x46, | ||
| 29 | 0xbe,0x7e,0x2d,0x7b,0x82,0xf9,0x40,0xb5, | ||
| 30 | 0x1d,0x73,0xf8,0xeb,0x26,0xc7,0x87,0x97, | ||
| 31 | 0x25,0x54,0xb1,0x28,0xaa,0x98,0x9d,0xa5, | ||
| 32 | 0x64,0x6d,0x7a,0xd4,0x10,0x81,0x44,0xef, | ||
| 33 | 0x49,0xd6,0xae,0x2e,0xdd,0x76,0x5c,0x2f, | ||
| 34 | 0xa7,0x1c,0xc9,0x09,0x69,0x9a,0x83,0xcf, | ||
| 35 | 0x29,0x39,0xb9,0xe9,0x4c,0xff,0x43,0xab, | ||
| 36 | }; | ||
| 37 | |||
| 38 | unsigned char num_to_ebits[256]={ | ||
| 39 | 0x5d,0xbe,0x9b,0x8b,0x11,0x99,0x6e,0x4d, | ||
| 40 | 0x59,0xf3,0x85,0xa6,0x3f,0xb7,0x83,0xc5, | ||
| 41 | 0xe4,0x73,0x6b,0x3a,0x68,0x5a,0xc0,0x47, | ||
| 42 | 0xa0,0x64,0x34,0x0c,0xf1,0xd0,0x52,0xa5, | ||
| 43 | 0xb9,0x1e,0x96,0x43,0x41,0xd8,0xd4,0x2c, | ||
| 44 | 0xdb,0xf8,0x07,0x77,0x2a,0xca,0xeb,0xef, | ||
| 45 | 0x10,0x1c,0x16,0x0d,0x38,0x72,0x2f,0x89, | ||
| 46 | 0xc1,0xf9,0x80,0xc4,0x6d,0xae,0x30,0x3d, | ||
| 47 | 0xce,0x20,0x63,0xfe,0xe6,0x1a,0xc7,0xb8, | ||
| 48 | 0x50,0xe8,0x24,0x17,0xfc,0x25,0x6f,0xbb, | ||
| 49 | 0x6a,0xa3,0x44,0x53,0xd9,0xa2,0x01,0xab, | ||
| 50 | 0xbc,0xb6,0x1f,0x98,0xee,0x9a,0xa7,0x2d, | ||
| 51 | 0x4f,0x9e,0x8e,0xac,0xe0,0xc6,0x49,0x46, | ||
| 52 | 0x29,0xf4,0x94,0x8a,0xaf,0xe1,0x5b,0xc3, | ||
| 53 | 0xb3,0x7b,0x57,0xd1,0x7c,0x9c,0xed,0x87, | ||
| 54 | 0x40,0x8c,0xe2,0xcb,0x93,0x14,0xc9,0x61, | ||
| 55 | 0x2e,0xe5,0xcc,0xf6,0x5e,0xa8,0x5c,0xd6, | ||
| 56 | 0x75,0x8d,0x62,0x95,0x58,0x69,0x76,0xa1, | ||
| 57 | 0x4a,0xb5,0x55,0x09,0x78,0x33,0x82,0xd7, | ||
| 58 | 0xdd,0x79,0xf5,0x1b,0x0b,0xde,0x26,0x21, | ||
| 59 | 0x28,0x74,0x04,0x97,0x56,0xdf,0x3c,0xf0, | ||
| 60 | 0x37,0x39,0xdc,0xff,0x06,0xa4,0xea,0x42, | ||
| 61 | 0x08,0xda,0xb4,0x71,0xb0,0xcf,0x12,0x7a, | ||
| 62 | 0x4e,0xfa,0x6c,0x1d,0x84,0x00,0xc8,0x7f, | ||
| 63 | 0x91,0x45,0xaa,0x2b,0xc2,0xb1,0x8f,0xd5, | ||
| 64 | 0xba,0xf2,0xad,0x19,0xb2,0x67,0x36,0xf7, | ||
| 65 | 0x0f,0x0a,0x92,0x7d,0xe3,0x9d,0xe9,0x90, | ||
| 66 | 0x3e,0x23,0x27,0x66,0x13,0xec,0x81,0x15, | ||
| 67 | 0xbd,0x22,0xbf,0x9f,0x7e,0xa9,0x51,0x4b, | ||
| 68 | 0x4c,0xfb,0x02,0xd3,0x70,0x86,0x31,0xe7, | ||
| 69 | 0x3b,0x05,0x03,0x54,0x60,0x48,0x65,0x18, | ||
| 70 | 0xd2,0xcd,0x5f,0x32,0x88,0x0e,0x35,0xfd, | ||
| 71 | }; | ||
| 72 | |||
| 73 | main() | ||
| 74 | { | ||
| 75 | int i,j; | ||
| 76 | |||
| 77 | for (i=0; i<256; i++) | ||
| 78 | { | ||
| 79 | for (j=0; j<256; j++) | ||
| 80 | if (ebits_to_num[j] == i) | ||
| 81 | { | ||
| 82 | printf("0x%02x,",j); | ||
| 83 | break; | ||
| 84 | } | ||
| 85 | } | ||
| 86 | } | ||
diff --git a/src/lib/libssl/src/crypto/rc4/rc4.c b/src/lib/libssl/src/crypto/rc4/rc4.c deleted file mode 100644 index c900b26055..0000000000 --- a/src/lib/libssl/src/crypto/rc4/rc4.c +++ /dev/null | |||
| @@ -1,193 +0,0 @@ | |||
| 1 | /* crypto/rc4/rc4.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include <stdlib.h> | ||
| 61 | #include <string.h> | ||
| 62 | #include <openssl/rc4.h> | ||
| 63 | #include <openssl/evp.h> | ||
| 64 | |||
| 65 | char *usage[]={ | ||
| 66 | "usage: rc4 args\n", | ||
| 67 | "\n", | ||
| 68 | " -in arg - input file - default stdin\n", | ||
| 69 | " -out arg - output file - default stdout\n", | ||
| 70 | " -key key - password\n", | ||
| 71 | NULL | ||
| 72 | }; | ||
| 73 | |||
| 74 | int main(int argc, char *argv[]) | ||
| 75 | { | ||
| 76 | FILE *in=NULL,*out=NULL; | ||
| 77 | char *infile=NULL,*outfile=NULL,*keystr=NULL; | ||
| 78 | RC4_KEY key; | ||
| 79 | char buf[BUFSIZ]; | ||
| 80 | int badops=0,i; | ||
| 81 | char **pp; | ||
| 82 | unsigned char md[MD5_DIGEST_LENGTH]; | ||
| 83 | |||
| 84 | argc--; | ||
| 85 | argv++; | ||
| 86 | while (argc >= 1) | ||
| 87 | { | ||
| 88 | if (strcmp(*argv,"-in") == 0) | ||
| 89 | { | ||
| 90 | if (--argc < 1) goto bad; | ||
| 91 | infile= *(++argv); | ||
| 92 | } | ||
| 93 | else if (strcmp(*argv,"-out") == 0) | ||
| 94 | { | ||
| 95 | if (--argc < 1) goto bad; | ||
| 96 | outfile= *(++argv); | ||
| 97 | } | ||
| 98 | else if (strcmp(*argv,"-key") == 0) | ||
| 99 | { | ||
| 100 | if (--argc < 1) goto bad; | ||
| 101 | keystr= *(++argv); | ||
| 102 | } | ||
| 103 | else | ||
| 104 | { | ||
| 105 | fprintf(stderr,"unknown option %s\n",*argv); | ||
| 106 | badops=1; | ||
| 107 | break; | ||
| 108 | } | ||
| 109 | argc--; | ||
| 110 | argv++; | ||
| 111 | } | ||
| 112 | |||
| 113 | if (badops) | ||
| 114 | { | ||
| 115 | bad: | ||
| 116 | for (pp=usage; (*pp != NULL); pp++) | ||
| 117 | fprintf(stderr,"%s",*pp); | ||
| 118 | exit(1); | ||
| 119 | } | ||
| 120 | |||
| 121 | if (infile == NULL) | ||
| 122 | in=stdin; | ||
| 123 | else | ||
| 124 | { | ||
| 125 | in=fopen(infile,"r"); | ||
| 126 | if (in == NULL) | ||
| 127 | { | ||
| 128 | perror("open"); | ||
| 129 | exit(1); | ||
| 130 | } | ||
| 131 | |||
| 132 | } | ||
| 133 | if (outfile == NULL) | ||
| 134 | out=stdout; | ||
| 135 | else | ||
| 136 | { | ||
| 137 | out=fopen(outfile,"w"); | ||
| 138 | if (out == NULL) | ||
| 139 | { | ||
| 140 | perror("open"); | ||
| 141 | exit(1); | ||
| 142 | } | ||
| 143 | } | ||
| 144 | |||
| 145 | #ifdef OPENSSL_SYS_MSDOS | ||
| 146 | /* This should set the file to binary mode. */ | ||
| 147 | { | ||
| 148 | #include <fcntl.h> | ||
| 149 | setmode(fileno(in),O_BINARY); | ||
| 150 | setmode(fileno(out),O_BINARY); | ||
| 151 | } | ||
| 152 | #endif | ||
| 153 | |||
| 154 | if (keystr == NULL) | ||
| 155 | { /* get key */ | ||
| 156 | i=EVP_read_pw_string(buf,BUFSIZ,"Enter RC4 password:",0); | ||
| 157 | if (i != 0) | ||
| 158 | { | ||
| 159 | OPENSSL_cleanse(buf,BUFSIZ); | ||
| 160 | fprintf(stderr,"bad password read\n"); | ||
| 161 | exit(1); | ||
| 162 | } | ||
| 163 | keystr=buf; | ||
| 164 | } | ||
| 165 | |||
| 166 | EVP_Digest((unsigned char *)keystr,strlen(keystr),md,NULL,EVP_md5(),NULL); | ||
| 167 | OPENSSL_cleanse(keystr,strlen(keystr)); | ||
| 168 | RC4_set_key(&key,MD5_DIGEST_LENGTH,md); | ||
| 169 | |||
| 170 | for(;;) | ||
| 171 | { | ||
| 172 | i=fread(buf,1,BUFSIZ,in); | ||
| 173 | if (i == 0) break; | ||
| 174 | if (i < 0) | ||
| 175 | { | ||
| 176 | perror("read"); | ||
| 177 | exit(1); | ||
| 178 | } | ||
| 179 | RC4(&key,(unsigned int)i,(unsigned char *)buf, | ||
| 180 | (unsigned char *)buf); | ||
| 181 | i=fwrite(buf,(unsigned int)i,1,out); | ||
| 182 | if (i != 1) | ||
| 183 | { | ||
| 184 | perror("write"); | ||
| 185 | exit(1); | ||
| 186 | } | ||
| 187 | } | ||
| 188 | fclose(out); | ||
| 189 | fclose(in); | ||
| 190 | exit(0); | ||
| 191 | return(1); | ||
| 192 | } | ||
| 193 | |||
diff --git a/src/lib/libssl/src/crypto/rc4/rc4speed.c b/src/lib/libssl/src/crypto/rc4/rc4speed.c deleted file mode 100644 index a495a73844..0000000000 --- a/src/lib/libssl/src/crypto/rc4/rc4speed.c +++ /dev/null | |||
| @@ -1,252 +0,0 @@ | |||
| 1 | /* crypto/rc4/rc4speed.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */ | ||
| 60 | /* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */ | ||
| 61 | |||
| 62 | #if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX) | ||
| 63 | #define TIMES | ||
| 64 | #endif | ||
| 65 | |||
| 66 | #include <stdio.h> | ||
| 67 | |||
| 68 | #include <openssl/e_os2.h> | ||
| 69 | #include <unistd.h> | ||
| 70 | |||
| 71 | #ifndef OPENSSL_SYS_NETWARE | ||
| 72 | #include <signal.h> | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #ifndef _IRIX | ||
| 76 | #include <time.h> | ||
| 77 | #endif | ||
| 78 | #ifdef TIMES | ||
| 79 | #include <sys/types.h> | ||
| 80 | #include <sys/times.h> | ||
| 81 | #endif | ||
| 82 | |||
| 83 | /* Depending on the VMS version, the tms structure is perhaps defined. | ||
| 84 | The __TMS macro will show if it was. If it wasn't defined, we should | ||
| 85 | undefine TIMES, since that tells the rest of the program how things | ||
| 86 | should be handled. -- Richard Levitte */ | ||
| 87 | #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS) | ||
| 88 | #undef TIMES | ||
| 89 | #endif | ||
| 90 | |||
| 91 | #ifndef TIMES | ||
| 92 | #include <sys/timeb.h> | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #if defined(sun) || defined(__ultrix) | ||
| 96 | #define _POSIX_SOURCE | ||
| 97 | #include <limits.h> | ||
| 98 | #include <sys/param.h> | ||
| 99 | #endif | ||
| 100 | |||
| 101 | #include <openssl/rc4.h> | ||
| 102 | |||
| 103 | /* The following if from times(3) man page. It may need to be changed */ | ||
| 104 | #ifndef HZ | ||
| 105 | #ifndef CLK_TCK | ||
| 106 | #define HZ 100.0 | ||
| 107 | #else /* CLK_TCK */ | ||
| 108 | #define HZ ((double)CLK_TCK) | ||
| 109 | #endif | ||
| 110 | #endif | ||
| 111 | |||
| 112 | #define BUFSIZE ((long)1024) | ||
| 113 | long run=0; | ||
| 114 | |||
| 115 | double Time_F(int s); | ||
| 116 | #ifdef SIGALRM | ||
| 117 | #if defined(__STDC__) || defined(sgi) || defined(_AIX) | ||
| 118 | #define SIGRETTYPE void | ||
| 119 | #else | ||
| 120 | #define SIGRETTYPE int | ||
| 121 | #endif | ||
| 122 | |||
| 123 | SIGRETTYPE sig_done(int sig); | ||
| 124 | SIGRETTYPE sig_done(int sig) | ||
| 125 | { | ||
| 126 | signal(SIGALRM,sig_done); | ||
| 127 | run=0; | ||
| 128 | #ifdef LINT | ||
| 129 | sig=sig; | ||
| 130 | #endif | ||
| 131 | } | ||
| 132 | #endif | ||
| 133 | |||
| 134 | #define START 0 | ||
| 135 | #define STOP 1 | ||
| 136 | |||
| 137 | double Time_F(int s) | ||
| 138 | { | ||
| 139 | double ret; | ||
| 140 | #ifdef TIMES | ||
| 141 | static struct tms tstart,tend; | ||
| 142 | |||
| 143 | if (s == START) | ||
| 144 | { | ||
| 145 | times(&tstart); | ||
| 146 | return(0); | ||
| 147 | } | ||
| 148 | else | ||
| 149 | { | ||
| 150 | times(&tend); | ||
| 151 | ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; | ||
| 152 | return((ret == 0.0)?1e-6:ret); | ||
| 153 | } | ||
| 154 | #else /* !times() */ | ||
| 155 | static struct timeb tstart,tend; | ||
| 156 | long i; | ||
| 157 | |||
| 158 | if (s == START) | ||
| 159 | { | ||
| 160 | ftime(&tstart); | ||
| 161 | return(0); | ||
| 162 | } | ||
| 163 | else | ||
| 164 | { | ||
| 165 | ftime(&tend); | ||
| 166 | i=(long)tend.millitm-(long)tstart.millitm; | ||
| 167 | ret=((double)(tend.time-tstart.time))+((double)i)/1e3; | ||
| 168 | return((ret == 0.0)?1e-6:ret); | ||
| 169 | } | ||
| 170 | #endif | ||
| 171 | } | ||
| 172 | |||
| 173 | int main(int argc, char **argv) | ||
| 174 | { | ||
| 175 | long count; | ||
| 176 | static unsigned char buf[BUFSIZE]; | ||
| 177 | static unsigned char key[] ={ | ||
| 178 | 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, | ||
| 179 | 0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10, | ||
| 180 | }; | ||
| 181 | RC4_KEY sch; | ||
| 182 | double a,b,c,d; | ||
| 183 | #ifndef SIGALRM | ||
| 184 | long ca,cb,cc; | ||
| 185 | #endif | ||
| 186 | |||
| 187 | #ifndef TIMES | ||
| 188 | printf("To get the most accurate results, try to run this\n"); | ||
| 189 | printf("program when this computer is idle.\n"); | ||
| 190 | #endif | ||
| 191 | |||
| 192 | #ifndef SIGALRM | ||
| 193 | printf("First we calculate the approximate speed ...\n"); | ||
| 194 | RC4_set_key(&sch,16,key); | ||
| 195 | count=10; | ||
| 196 | do { | ||
| 197 | long i; | ||
| 198 | unsigned long data[2]; | ||
| 199 | |||
| 200 | count*=2; | ||
| 201 | Time_F(START); | ||
| 202 | for (i=count; i; i--) | ||
| 203 | RC4(&sch,8,buf,buf); | ||
| 204 | d=Time_F(STOP); | ||
| 205 | } while (d < 3.0); | ||
| 206 | ca=count/512; | ||
| 207 | cc=count*8/BUFSIZE+1; | ||
| 208 | printf("Doing RC4_set_key %ld times\n",ca); | ||
| 209 | #define COND(d) (count != (d)) | ||
| 210 | #define COUNT(d) (d) | ||
| 211 | #else | ||
| 212 | #define COND(c) (run) | ||
| 213 | #define COUNT(d) (count) | ||
| 214 | signal(SIGALRM,sig_done); | ||
| 215 | printf("Doing RC4_set_key for 10 seconds\n"); | ||
| 216 | alarm(10); | ||
| 217 | #endif | ||
| 218 | |||
| 219 | Time_F(START); | ||
| 220 | for (count=0,run=1; COND(ca); count+=4) | ||
| 221 | { | ||
| 222 | RC4_set_key(&sch,16,key); | ||
| 223 | RC4_set_key(&sch,16,key); | ||
| 224 | RC4_set_key(&sch,16,key); | ||
| 225 | RC4_set_key(&sch,16,key); | ||
| 226 | } | ||
| 227 | d=Time_F(STOP); | ||
| 228 | printf("%ld RC4_set_key's in %.2f seconds\n",count,d); | ||
| 229 | a=((double)COUNT(ca))/d; | ||
| 230 | |||
| 231 | #ifdef SIGALRM | ||
| 232 | printf("Doing RC4 on %ld byte blocks for 10 seconds\n",BUFSIZE); | ||
| 233 | alarm(10); | ||
| 234 | #else | ||
| 235 | printf("Doing RC4 %ld times on %ld byte blocks\n",cc,BUFSIZE); | ||
| 236 | #endif | ||
| 237 | Time_F(START); | ||
| 238 | for (count=0,run=1; COND(cc); count++) | ||
| 239 | RC4(&sch,BUFSIZE,buf,buf); | ||
| 240 | d=Time_F(STOP); | ||
| 241 | printf("%ld RC4's of %ld byte blocks in %.2f second\n", | ||
| 242 | count,BUFSIZE,d); | ||
| 243 | c=((double)COUNT(cc)*BUFSIZE)/d; | ||
| 244 | |||
| 245 | printf("RC4 set_key per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a); | ||
| 246 | printf("RC4 bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c); | ||
| 247 | exit(0); | ||
| 248 | #if defined(LINT) || defined(OPENSSL_SYS_MSDOS) | ||
| 249 | return(0); | ||
| 250 | #endif | ||
| 251 | } | ||
| 252 | |||
diff --git a/src/lib/libssl/src/crypto/sha/sha.c b/src/lib/libssl/src/crypto/sha/sha.c deleted file mode 100644 index 42126551d1..0000000000 --- a/src/lib/libssl/src/crypto/sha/sha.c +++ /dev/null | |||
| @@ -1,124 +0,0 @@ | |||
| 1 | /* crypto/sha/sha.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include <stdlib.h> | ||
| 61 | #include <openssl/sha.h> | ||
| 62 | |||
| 63 | #define BUFSIZE 1024*16 | ||
| 64 | |||
| 65 | void do_fp(FILE *f); | ||
| 66 | void pt(unsigned char *md); | ||
| 67 | int read(int, void *, unsigned int); | ||
| 68 | int main(int argc, char **argv) | ||
| 69 | { | ||
| 70 | int i,err=0; | ||
| 71 | FILE *IN; | ||
| 72 | |||
| 73 | if (argc == 1) | ||
| 74 | { | ||
| 75 | do_fp(stdin); | ||
| 76 | } | ||
| 77 | else | ||
| 78 | { | ||
| 79 | for (i=1; i<argc; i++) | ||
| 80 | { | ||
| 81 | IN=fopen(argv[i],"r"); | ||
| 82 | if (IN == NULL) | ||
| 83 | { | ||
| 84 | perror(argv[i]); | ||
| 85 | err++; | ||
| 86 | continue; | ||
| 87 | } | ||
| 88 | printf("SHA(%s)= ",argv[i]); | ||
| 89 | do_fp(IN); | ||
| 90 | fclose(IN); | ||
| 91 | } | ||
| 92 | } | ||
| 93 | exit(err); | ||
| 94 | } | ||
| 95 | |||
| 96 | void do_fp(FILE *f) | ||
| 97 | { | ||
| 98 | SHA_CTX c; | ||
| 99 | unsigned char md[SHA_DIGEST_LENGTH]; | ||
| 100 | int fd; | ||
| 101 | int i; | ||
| 102 | unsigned char buf[BUFSIZE]; | ||
| 103 | |||
| 104 | fd=fileno(f); | ||
| 105 | SHA_Init(&c); | ||
| 106 | for (;;) | ||
| 107 | { | ||
| 108 | i=read(fd,buf,BUFSIZE); | ||
| 109 | if (i <= 0) break; | ||
| 110 | SHA_Update(&c,buf,(unsigned long)i); | ||
| 111 | } | ||
| 112 | SHA_Final(&(md[0]),&c); | ||
| 113 | pt(md); | ||
| 114 | } | ||
| 115 | |||
| 116 | void pt(unsigned char *md) | ||
| 117 | { | ||
| 118 | int i; | ||
| 119 | |||
| 120 | for (i=0; i<SHA_DIGEST_LENGTH; i++) | ||
| 121 | printf("%02x",md[i]); | ||
| 122 | printf("\n"); | ||
| 123 | } | ||
| 124 | |||
diff --git a/src/lib/libssl/src/crypto/sha/sha1.c b/src/lib/libssl/src/crypto/sha/sha1.c deleted file mode 100644 index fd56a1e756..0000000000 --- a/src/lib/libssl/src/crypto/sha/sha1.c +++ /dev/null | |||
| @@ -1,125 +0,0 @@ | |||
| 1 | /* crypto/sha/sha1.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <unistd.h> | ||
| 60 | #include <stdio.h> | ||
| 61 | #include <stdlib.h> | ||
| 62 | #include <openssl/sha.h> | ||
| 63 | |||
| 64 | #define BUFSIZE 1024*16 | ||
| 65 | |||
| 66 | void do_fp(FILE *f); | ||
| 67 | void pt(unsigned char *md); | ||
| 68 | |||
| 69 | int main(int argc, char **argv) | ||
| 70 | { | ||
| 71 | int i,err=0; | ||
| 72 | FILE *IN; | ||
| 73 | |||
| 74 | if (argc == 1) | ||
| 75 | { | ||
| 76 | do_fp(stdin); | ||
| 77 | } | ||
| 78 | else | ||
| 79 | { | ||
| 80 | for (i=1; i<argc; i++) | ||
| 81 | { | ||
| 82 | IN=fopen(argv[i],"r"); | ||
| 83 | if (IN == NULL) | ||
| 84 | { | ||
| 85 | perror(argv[i]); | ||
| 86 | err++; | ||
| 87 | continue; | ||
| 88 | } | ||
| 89 | printf("SHA1(%s)= ",argv[i]); | ||
| 90 | do_fp(IN); | ||
| 91 | fclose(IN); | ||
| 92 | } | ||
| 93 | } | ||
| 94 | exit(err); | ||
| 95 | } | ||
| 96 | |||
| 97 | void do_fp(FILE *f) | ||
| 98 | { | ||
| 99 | SHA_CTX c; | ||
| 100 | unsigned char md[SHA_DIGEST_LENGTH]; | ||
| 101 | int fd; | ||
| 102 | int i; | ||
| 103 | unsigned char buf[BUFSIZE]; | ||
| 104 | |||
| 105 | fd=fileno(f); | ||
| 106 | SHA1_Init(&c); | ||
| 107 | for (;;) | ||
| 108 | { | ||
| 109 | i=read(fd,buf,BUFSIZE); | ||
| 110 | if (i <= 0) break; | ||
| 111 | SHA1_Update(&c,buf,(unsigned long)i); | ||
| 112 | } | ||
| 113 | SHA1_Final(&(md[0]),&c); | ||
| 114 | pt(md); | ||
| 115 | } | ||
| 116 | |||
| 117 | void pt(unsigned char *md) | ||
| 118 | { | ||
| 119 | int i; | ||
| 120 | |||
| 121 | for (i=0; i<SHA_DIGEST_LENGTH; i++) | ||
| 122 | printf("%02x",md[i]); | ||
| 123 | printf("\n"); | ||
| 124 | } | ||
| 125 | |||
