diff options
| author | cvs2svn <admin@example.com> | 2008-02-26 10:48:17 +0000 |
|---|---|---|
| committer | cvs2svn <admin@example.com> | 2008-02-26 10:48:17 +0000 |
| commit | f73a33b004c9c6281768846f2609a4496ce518a3 (patch) | |
| tree | cd1f342f086d6b52c792f34136f57e906cf705e8 /src/lib/libcrypto/rand | |
| parent | b89c0dd40131bd782fa134e50e256db35c015e98 (diff) | |
| download | openbsd-OPENBSD_4_3_BASE.tar.gz openbsd-OPENBSD_4_3_BASE.tar.bz2 openbsd-OPENBSD_4_3_BASE.zip | |
This commit was manufactured by cvs2git to create tag 'OPENBSD_4_3_BASE'.OPENBSD_4_3_BASE
Diffstat (limited to 'src/lib/libcrypto/rand')
| -rw-r--r-- | src/lib/libcrypto/rand/rand.h | 143 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_err.c | 105 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_lib.c | 192 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/randfile.c | 285 |
4 files changed, 0 insertions, 725 deletions
diff --git a/src/lib/libcrypto/rand/rand.h b/src/lib/libcrypto/rand/rand.h deleted file mode 100644 index 604df9be6c..0000000000 --- a/src/lib/libcrypto/rand/rand.h +++ /dev/null | |||
| @@ -1,143 +0,0 @@ | |||
| 1 | /* crypto/rand/rand.h */ | ||
| 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 | #ifndef HEADER_RAND_H | ||
| 60 | #define HEADER_RAND_H | ||
| 61 | |||
| 62 | #include <stdlib.h> | ||
| 63 | #include <openssl/ossl_typ.h> | ||
| 64 | #include <openssl/e_os2.h> | ||
| 65 | |||
| 66 | #if defined(OPENSSL_SYS_WINDOWS) | ||
| 67 | #include <windows.h> | ||
| 68 | #endif | ||
| 69 | |||
| 70 | #ifdef __cplusplus | ||
| 71 | extern "C" { | ||
| 72 | #endif | ||
| 73 | |||
| 74 | #if defined(OPENSSL_FIPS) | ||
| 75 | #define FIPS_RAND_SIZE_T int | ||
| 76 | #endif | ||
| 77 | |||
| 78 | typedef struct rand_meth_st | ||
| 79 | { | ||
| 80 | void (*seed)(const void *buf, int num); | ||
| 81 | int (*bytes)(unsigned char *buf, int num); | ||
| 82 | void (*cleanup)(void); | ||
| 83 | void (*add)(const void *buf, int num, double entropy); | ||
| 84 | int (*pseudorand)(unsigned char *buf, int num); | ||
| 85 | int (*status)(void); | ||
| 86 | } RAND_METHOD; | ||
| 87 | |||
| 88 | #ifdef BN_DEBUG | ||
| 89 | extern int rand_predictable; | ||
| 90 | #endif | ||
| 91 | |||
| 92 | int RAND_set_rand_method(const RAND_METHOD *meth); | ||
| 93 | const RAND_METHOD *RAND_get_rand_method(void); | ||
| 94 | #ifndef OPENSSL_NO_ENGINE | ||
| 95 | int RAND_set_rand_engine(ENGINE *engine); | ||
| 96 | #endif | ||
| 97 | RAND_METHOD *RAND_SSLeay(void); | ||
| 98 | void RAND_cleanup(void ); | ||
| 99 | int RAND_bytes(unsigned char *buf,int num); | ||
| 100 | int RAND_pseudo_bytes(unsigned char *buf,int num); | ||
| 101 | void RAND_seed(const void *buf,int num); | ||
| 102 | void RAND_add(const void *buf,int num,double entropy); | ||
| 103 | int RAND_load_file(const char *file,long max_bytes); | ||
| 104 | int RAND_write_file(const char *file); | ||
| 105 | const char *RAND_file_name(char *file,size_t num); | ||
| 106 | int RAND_status(void); | ||
| 107 | int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes); | ||
| 108 | int RAND_egd(const char *path); | ||
| 109 | int RAND_egd_bytes(const char *path,int bytes); | ||
| 110 | int RAND_poll(void); | ||
| 111 | |||
| 112 | #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) | ||
| 113 | |||
| 114 | void RAND_screen(void); | ||
| 115 | int RAND_event(UINT, WPARAM, LPARAM); | ||
| 116 | |||
| 117 | #endif | ||
| 118 | |||
| 119 | /* BEGIN ERROR CODES */ | ||
| 120 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
| 121 | * made after this point may be overwritten when the script is next run. | ||
| 122 | */ | ||
| 123 | void ERR_load_RAND_strings(void); | ||
| 124 | |||
| 125 | /* Error codes for the RAND functions. */ | ||
| 126 | |||
| 127 | /* Function codes. */ | ||
| 128 | #define RAND_F_FIPS_RAND_BYTES 102 | ||
| 129 | #define RAND_F_RAND_GET_RAND_METHOD 101 | ||
| 130 | #define RAND_F_SSLEAY_RAND_BYTES 100 | ||
| 131 | |||
| 132 | /* Reason codes. */ | ||
| 133 | #define RAND_R_NON_FIPS_METHOD 101 | ||
| 134 | #define RAND_R_PRNG_ASKING_FOR_TOO_MUCH 105 | ||
| 135 | #define RAND_R_PRNG_NOT_REKEYED 103 | ||
| 136 | #define RAND_R_PRNG_NOT_RESEEDED 104 | ||
| 137 | #define RAND_R_PRNG_NOT_SEEDED 100 | ||
| 138 | #define RAND_R_PRNG_STUCK 102 | ||
| 139 | |||
| 140 | #ifdef __cplusplus | ||
| 141 | } | ||
| 142 | #endif | ||
| 143 | #endif | ||
diff --git a/src/lib/libcrypto/rand/rand_err.c b/src/lib/libcrypto/rand/rand_err.c deleted file mode 100644 index 97f96e1aee..0000000000 --- a/src/lib/libcrypto/rand/rand_err.c +++ /dev/null | |||
| @@ -1,105 +0,0 @@ | |||
| 1 | /* crypto/rand/rand_err.c */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. | ||
| 4 | * | ||
| 5 | * Redistribution and use in source and binary forms, with or without | ||
| 6 | * modification, are permitted provided that the following conditions | ||
| 7 | * are met: | ||
| 8 | * | ||
| 9 | * 1. Redistributions of source code must retain the above copyright | ||
| 10 | * notice, this list of conditions and the following disclaimer. | ||
| 11 | * | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in | ||
| 14 | * the documentation and/or other materials provided with the | ||
| 15 | * distribution. | ||
| 16 | * | ||
| 17 | * 3. All advertising materials mentioning features or use of this | ||
| 18 | * software must display the following acknowledgment: | ||
| 19 | * "This product includes software developed by the OpenSSL Project | ||
| 20 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 21 | * | ||
| 22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 23 | * endorse or promote products derived from this software without | ||
| 24 | * prior written permission. For written permission, please contact | ||
| 25 | * openssl-core@OpenSSL.org. | ||
| 26 | * | ||
| 27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 28 | * nor may "OpenSSL" appear in their names without prior written | ||
| 29 | * permission of the OpenSSL Project. | ||
| 30 | * | ||
| 31 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 32 | * acknowledgment: | ||
| 33 | * "This product includes software developed by the OpenSSL Project | ||
| 34 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 35 | * | ||
| 36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 48 | * ==================================================================== | ||
| 49 | * | ||
| 50 | * This product includes cryptographic software written by Eric Young | ||
| 51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 52 | * Hudson (tjh@cryptsoft.com). | ||
| 53 | * | ||
| 54 | */ | ||
| 55 | |||
| 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | ||
| 57 | * made to it will be overwritten when the script next updates this file, | ||
| 58 | * only reason strings will be preserved. | ||
| 59 | */ | ||
| 60 | |||
| 61 | #include <stdio.h> | ||
| 62 | #include <openssl/err.h> | ||
| 63 | #include <openssl/rand.h> | ||
| 64 | |||
| 65 | /* BEGIN ERROR CODES */ | ||
| 66 | #ifndef OPENSSL_NO_ERR | ||
| 67 | |||
| 68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_RAND,func,0) | ||
| 69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_RAND,0,reason) | ||
| 70 | |||
| 71 | static ERR_STRING_DATA RAND_str_functs[]= | ||
| 72 | { | ||
| 73 | {ERR_FUNC(RAND_F_FIPS_RAND_BYTES), "FIPS_RAND_BYTES"}, | ||
| 74 | {ERR_FUNC(RAND_F_RAND_GET_RAND_METHOD), "RAND_get_rand_method"}, | ||
| 75 | {ERR_FUNC(RAND_F_SSLEAY_RAND_BYTES), "SSLEAY_RAND_BYTES"}, | ||
| 76 | {0,NULL} | ||
| 77 | }; | ||
| 78 | |||
| 79 | static ERR_STRING_DATA RAND_str_reasons[]= | ||
| 80 | { | ||
| 81 | {ERR_REASON(RAND_R_NON_FIPS_METHOD) ,"non fips method"}, | ||
| 82 | {ERR_REASON(RAND_R_PRNG_ASKING_FOR_TOO_MUCH),"prng asking for too much"}, | ||
| 83 | {ERR_REASON(RAND_R_PRNG_NOT_REKEYED) ,"prng not rekeyed"}, | ||
| 84 | {ERR_REASON(RAND_R_PRNG_NOT_RESEEDED) ,"prng not reseeded"}, | ||
| 85 | {ERR_REASON(RAND_R_PRNG_NOT_SEEDED) ,"PRNG not seeded"}, | ||
| 86 | {ERR_REASON(RAND_R_PRNG_STUCK) ,"prng stuck"}, | ||
| 87 | {0,NULL} | ||
| 88 | }; | ||
| 89 | |||
| 90 | #endif | ||
| 91 | |||
| 92 | void ERR_load_RAND_strings(void) | ||
| 93 | { | ||
| 94 | static int init=1; | ||
| 95 | |||
| 96 | if (init) | ||
| 97 | { | ||
| 98 | init=0; | ||
| 99 | #ifndef OPENSSL_NO_ERR | ||
| 100 | ERR_load_strings(0,RAND_str_functs); | ||
| 101 | ERR_load_strings(0,RAND_str_reasons); | ||
| 102 | #endif | ||
| 103 | |||
| 104 | } | ||
| 105 | } | ||
diff --git a/src/lib/libcrypto/rand/rand_lib.c b/src/lib/libcrypto/rand/rand_lib.c deleted file mode 100644 index a21bde79de..0000000000 --- a/src/lib/libcrypto/rand/rand_lib.c +++ /dev/null | |||
| @@ -1,192 +0,0 @@ | |||
| 1 | /* crypto/rand/rand_lib.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 <time.h> | ||
| 61 | #include "cryptlib.h" | ||
| 62 | #include <openssl/rand.h> | ||
| 63 | #ifndef OPENSSL_NO_ENGINE | ||
| 64 | #include <openssl/engine.h> | ||
| 65 | #endif | ||
| 66 | #include <openssl/fips.h> | ||
| 67 | #include <openssl/fips_rand.h> | ||
| 68 | |||
| 69 | #ifndef OPENSSL_NO_ENGINE | ||
| 70 | /* non-NULL if default_RAND_meth is ENGINE-provided */ | ||
| 71 | static ENGINE *funct_ref =NULL; | ||
| 72 | #endif | ||
| 73 | static const RAND_METHOD *default_RAND_meth = NULL; | ||
| 74 | |||
| 75 | int RAND_set_rand_method(const RAND_METHOD *meth) | ||
| 76 | { | ||
| 77 | #ifndef OPENSSL_NO_ENGINE | ||
| 78 | if(funct_ref) | ||
| 79 | { | ||
| 80 | ENGINE_finish(funct_ref); | ||
| 81 | funct_ref = NULL; | ||
| 82 | } | ||
| 83 | #endif | ||
| 84 | default_RAND_meth = meth; | ||
| 85 | return 1; | ||
| 86 | } | ||
| 87 | |||
| 88 | const RAND_METHOD *RAND_get_rand_method(void) | ||
| 89 | { | ||
| 90 | if (!default_RAND_meth) | ||
| 91 | { | ||
| 92 | #ifndef OPENSSL_NO_ENGINE | ||
| 93 | ENGINE *e = ENGINE_get_default_RAND(); | ||
| 94 | if(e) | ||
| 95 | { | ||
| 96 | default_RAND_meth = ENGINE_get_RAND(e); | ||
| 97 | if(!default_RAND_meth) | ||
| 98 | { | ||
| 99 | ENGINE_finish(e); | ||
| 100 | e = NULL; | ||
| 101 | } | ||
| 102 | } | ||
| 103 | if(e) | ||
| 104 | funct_ref = e; | ||
| 105 | else | ||
| 106 | #endif | ||
| 107 | #ifdef OPENSSL_FIPS | ||
| 108 | if(FIPS_mode()) | ||
| 109 | default_RAND_meth=FIPS_rand_method(); | ||
| 110 | else | ||
| 111 | #endif | ||
| 112 | default_RAND_meth = RAND_SSLeay(); | ||
| 113 | } | ||
| 114 | |||
| 115 | #ifdef OPENSSL_FIPS | ||
| 116 | if(FIPS_mode() | ||
| 117 | && default_RAND_meth != FIPS_rand_check()) | ||
| 118 | { | ||
| 119 | RANDerr(RAND_F_RAND_GET_RAND_METHOD,RAND_R_NON_FIPS_METHOD); | ||
| 120 | return 0; | ||
| 121 | } | ||
| 122 | #endif | ||
| 123 | return default_RAND_meth; | ||
| 124 | } | ||
| 125 | |||
| 126 | #ifndef OPENSSL_NO_ENGINE | ||
| 127 | int RAND_set_rand_engine(ENGINE *engine) | ||
| 128 | { | ||
| 129 | const RAND_METHOD *tmp_meth = NULL; | ||
| 130 | if(engine) | ||
| 131 | { | ||
| 132 | if(!ENGINE_init(engine)) | ||
| 133 | return 0; | ||
| 134 | tmp_meth = ENGINE_get_RAND(engine); | ||
| 135 | if(!tmp_meth) | ||
| 136 | { | ||
| 137 | ENGINE_finish(engine); | ||
| 138 | return 0; | ||
| 139 | } | ||
| 140 | } | ||
| 141 | /* This function releases any prior ENGINE so call it first */ | ||
| 142 | RAND_set_rand_method(tmp_meth); | ||
| 143 | funct_ref = engine; | ||
| 144 | return 1; | ||
| 145 | } | ||
| 146 | #endif | ||
| 147 | |||
| 148 | void RAND_cleanup(void) | ||
| 149 | { | ||
| 150 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 151 | if (meth && meth->cleanup) | ||
| 152 | meth->cleanup(); | ||
| 153 | RAND_set_rand_method(NULL); | ||
| 154 | } | ||
| 155 | |||
| 156 | void RAND_seed(const void *buf, int num) | ||
| 157 | { | ||
| 158 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 159 | if (meth && meth->seed) | ||
| 160 | meth->seed(buf,num); | ||
| 161 | } | ||
| 162 | |||
| 163 | void RAND_add(const void *buf, int num, double entropy) | ||
| 164 | { | ||
| 165 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 166 | if (meth && meth->add) | ||
| 167 | meth->add(buf,num,entropy); | ||
| 168 | } | ||
| 169 | |||
| 170 | int RAND_bytes(unsigned char *buf, int num) | ||
| 171 | { | ||
| 172 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 173 | if (meth && meth->bytes) | ||
| 174 | return meth->bytes(buf,num); | ||
| 175 | return(-1); | ||
| 176 | } | ||
| 177 | |||
| 178 | int RAND_pseudo_bytes(unsigned char *buf, int num) | ||
| 179 | { | ||
| 180 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 181 | if (meth && meth->pseudorand) | ||
| 182 | return meth->pseudorand(buf,num); | ||
| 183 | return(-1); | ||
| 184 | } | ||
| 185 | |||
| 186 | int RAND_status(void) | ||
| 187 | { | ||
| 188 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 189 | if (meth && meth->status) | ||
| 190 | return meth->status(); | ||
| 191 | return 0; | ||
| 192 | } | ||
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c deleted file mode 100644 index d847d8ebdf..0000000000 --- a/src/lib/libcrypto/rand/randfile.c +++ /dev/null | |||
| @@ -1,285 +0,0 @@ | |||
| 1 | /* crypto/rand/randfile.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 | /* We need to define this to get macros like S_IFBLK and S_IFCHR */ | ||
| 60 | #define _XOPEN_SOURCE 500 | ||
| 61 | |||
| 62 | #include <errno.h> | ||
| 63 | #include <stdio.h> | ||
| 64 | #include <stdlib.h> | ||
| 65 | #include <string.h> | ||
| 66 | |||
| 67 | #include "e_os.h" | ||
| 68 | #include <openssl/crypto.h> | ||
| 69 | #include <openssl/rand.h> | ||
| 70 | #include <openssl/buffer.h> | ||
| 71 | |||
| 72 | #ifdef OPENSSL_SYS_VMS | ||
| 73 | #include <unixio.h> | ||
| 74 | #endif | ||
| 75 | #ifndef NO_SYS_TYPES_H | ||
| 76 | # include <sys/types.h> | ||
| 77 | #endif | ||
| 78 | #ifdef MAC_OS_pre_X | ||
| 79 | # include <stat.h> | ||
| 80 | #else | ||
| 81 | # include <sys/stat.h> | ||
| 82 | #endif | ||
| 83 | |||
| 84 | #undef BUFSIZE | ||
| 85 | #define BUFSIZE 1024 | ||
| 86 | #define RAND_DATA 1024 | ||
| 87 | |||
| 88 | /* #define RFILE ".rnd" - defined in ../../e_os.h */ | ||
| 89 | |||
| 90 | /* Note that these functions are intended for seed files only. | ||
| 91 | * Entropy devices and EGD sockets are handled in rand_unix.c */ | ||
| 92 | |||
| 93 | int RAND_load_file(const char *file, long bytes) | ||
| 94 | { | ||
| 95 | /* If bytes >= 0, read up to 'bytes' bytes. | ||
| 96 | * if bytes == -1, read complete file. */ | ||
| 97 | |||
| 98 | MS_STATIC unsigned char buf[BUFSIZE]; | ||
| 99 | struct stat sb; | ||
| 100 | int i,ret=0,n; | ||
| 101 | FILE *in; | ||
| 102 | |||
| 103 | if (file == NULL) return(0); | ||
| 104 | |||
| 105 | i=stat(file,&sb); | ||
| 106 | /* If the state fails, put some crap in anyway */ | ||
| 107 | RAND_add(&sb,sizeof(sb),0); | ||
| 108 | if (i < 0) return(0); | ||
| 109 | if (bytes == 0) return(ret); | ||
| 110 | |||
| 111 | in=fopen(file,"rb"); | ||
| 112 | if (in == NULL) goto err; | ||
| 113 | #if defined(S_IFBLK) && defined(S_IFCHR) | ||
| 114 | if (sb.st_mode & (S_IFBLK | S_IFCHR)) { | ||
| 115 | /* this file is a device. we don't want read an infinite number | ||
| 116 | * of bytes from a random device, nor do we want to use buffered | ||
| 117 | * I/O because we will waste system entropy. | ||
| 118 | */ | ||
| 119 | bytes = (bytes == -1) ? 2048 : bytes; /* ok, is 2048 enough? */ | ||
| 120 | setvbuf(in, NULL, _IONBF, 0); /* don't do buffered reads */ | ||
| 121 | } | ||
| 122 | #endif | ||
| 123 | for (;;) | ||
| 124 | { | ||
| 125 | if (bytes > 0) | ||
| 126 | n = (bytes < BUFSIZE)?(int)bytes:BUFSIZE; | ||
| 127 | else | ||
| 128 | n = BUFSIZE; | ||
| 129 | i=fread(buf,1,n,in); | ||
| 130 | if (i <= 0) break; | ||
| 131 | /* even if n != i, use the full array */ | ||
| 132 | RAND_add(buf,n,i); | ||
| 133 | ret+=i; | ||
| 134 | if (bytes > 0) | ||
| 135 | { | ||
| 136 | bytes-=n; | ||
| 137 | if (bytes <= 0) break; | ||
| 138 | } | ||
| 139 | } | ||
| 140 | fclose(in); | ||
| 141 | OPENSSL_cleanse(buf,BUFSIZE); | ||
| 142 | err: | ||
| 143 | return(ret); | ||
| 144 | } | ||
| 145 | |||
| 146 | int RAND_write_file(const char *file) | ||
| 147 | { | ||
| 148 | unsigned char buf[BUFSIZE]; | ||
| 149 | int i,ret=0,rand_err=0; | ||
| 150 | FILE *out = NULL; | ||
| 151 | int n; | ||
| 152 | struct stat sb; | ||
| 153 | |||
| 154 | i=stat(file,&sb); | ||
| 155 | if (i != -1) { | ||
| 156 | #if defined(S_IFBLK) && defined(S_IFCHR) | ||
| 157 | if (sb.st_mode & (S_IFBLK | S_IFCHR)) { | ||
| 158 | /* this file is a device. we don't write back to it. | ||
| 159 | * we "succeed" on the assumption this is some sort | ||
| 160 | * of random device. Otherwise attempting to write to | ||
| 161 | * and chmod the device causes problems. | ||
| 162 | */ | ||
| 163 | return(1); | ||
| 164 | } | ||
| 165 | #endif | ||
| 166 | } | ||
| 167 | |||
| 168 | #if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32) | ||
| 169 | { | ||
| 170 | /* For some reason Win32 can't write to files created this way */ | ||
| 171 | |||
| 172 | /* chmod(..., 0600) is too late to protect the file, | ||
| 173 | * permissions should be restrictive from the start */ | ||
| 174 | int fd = open(file, O_CREAT, 0600); | ||
| 175 | if (fd != -1) | ||
| 176 | out = fdopen(fd, "wb"); | ||
| 177 | } | ||
| 178 | #endif | ||
| 179 | if (out == NULL) | ||
| 180 | out = fopen(file,"wb"); | ||
| 181 | if (out == NULL) goto err; | ||
| 182 | |||
| 183 | #ifndef NO_CHMOD | ||
| 184 | chmod(file,0600); | ||
| 185 | #endif | ||
| 186 | n=RAND_DATA; | ||
| 187 | for (;;) | ||
| 188 | { | ||
| 189 | i=(n > BUFSIZE)?BUFSIZE:n; | ||
| 190 | n-=BUFSIZE; | ||
| 191 | if (RAND_bytes(buf,i) <= 0) | ||
| 192 | rand_err=1; | ||
| 193 | i=fwrite(buf,1,i,out); | ||
| 194 | if (i <= 0) | ||
| 195 | { | ||
| 196 | ret=0; | ||
| 197 | break; | ||
| 198 | } | ||
| 199 | ret+=i; | ||
| 200 | if (n <= 0) break; | ||
| 201 | } | ||
| 202 | #ifdef OPENSSL_SYS_VMS | ||
| 203 | /* Try to delete older versions of the file, until there aren't | ||
| 204 | any */ | ||
| 205 | { | ||
| 206 | char *tmpf; | ||
| 207 | |||
| 208 | tmpf = OPENSSL_malloc(strlen(file) + 4); /* to add ";-1" and a nul */ | ||
| 209 | if (tmpf) | ||
| 210 | { | ||
| 211 | strcpy(tmpf, file); | ||
| 212 | strcat(tmpf, ";-1"); | ||
| 213 | while(delete(tmpf) == 0) | ||
| 214 | ; | ||
| 215 | rename(file,";1"); /* Make sure it's version 1, or we | ||
| 216 | will reach the limit (32767) at | ||
| 217 | some point... */ | ||
| 218 | } | ||
| 219 | } | ||
| 220 | #endif /* OPENSSL_SYS_VMS */ | ||
| 221 | |||
| 222 | fclose(out); | ||
| 223 | OPENSSL_cleanse(buf,BUFSIZE); | ||
| 224 | err: | ||
| 225 | return (rand_err ? -1 : ret); | ||
| 226 | } | ||
| 227 | |||
| 228 | const char *RAND_file_name(char *buf, size_t size) | ||
| 229 | { | ||
| 230 | char *s=NULL; | ||
| 231 | int ok = 0; | ||
| 232 | #ifdef __OpenBSD__ | ||
| 233 | struct stat sb; | ||
| 234 | #endif | ||
| 235 | |||
| 236 | if (issetugid() == 0) | ||
| 237 | s=getenv("RANDFILE"); | ||
| 238 | if (s != NULL && *s && strlen(s) + 1 < size) | ||
| 239 | { | ||
| 240 | if (BUF_strlcpy(buf,s,size) >= size) | ||
| 241 | return NULL; | ||
| 242 | } | ||
| 243 | else | ||
| 244 | { | ||
| 245 | if (issetugid() == 0) | ||
| 246 | s=getenv("HOME"); | ||
| 247 | #ifdef DEFAULT_HOME | ||
| 248 | if (s == NULL) | ||
| 249 | { | ||
| 250 | s = DEFAULT_HOME; | ||
| 251 | } | ||
| 252 | #endif | ||
| 253 | if (s && *s && strlen(s)+strlen(RFILE)+2 < size) | ||
| 254 | { | ||
| 255 | BUF_strlcpy(buf,s,size); | ||
| 256 | #ifndef OPENSSL_SYS_VMS | ||
| 257 | BUF_strlcat(buf,"/",size); | ||
| 258 | #endif | ||
| 259 | BUF_strlcat(buf,RFILE,size); | ||
| 260 | ok = 1; | ||
| 261 | } | ||
| 262 | else | ||
| 263 | buf[0] = '\0'; /* no file name */ | ||
| 264 | } | ||
| 265 | |||
| 266 | #ifdef __OpenBSD__ | ||
| 267 | /* given that all random loads just fail if the file can't be | ||
| 268 | * seen on a stat, we stat the file we're returning, if it | ||
| 269 | * fails, use /dev/arandom instead. this allows the user to | ||
| 270 | * use their own source for good random data, but defaults | ||
| 271 | * to something hopefully decent if that isn't available. | ||
| 272 | */ | ||
| 273 | |||
| 274 | if (!ok) | ||
| 275 | if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) { | ||
| 276 | return(NULL); | ||
| 277 | } | ||
| 278 | if (stat(buf,&sb) == -1) | ||
| 279 | if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) { | ||
| 280 | return(NULL); | ||
| 281 | } | ||
| 282 | |||
| 283 | #endif | ||
| 284 | return(buf); | ||
| 285 | } | ||
