diff options
| author | kris <kris@FreeBSD.org> | 2001-07-19 20:05:28 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2001-07-19 20:05:28 +0000 |
| commit | 18cbcd5effa4ebab72f9f535e44a5fbef433d087 (patch) | |
| tree | b2d3a3c4344c814837ab109307bb7509bb253496 /crypto | |
| parent | 84fabcda925860c067e7f03b07d3a988add59e0b (diff) | |
| download | FreeBSD-src-18cbcd5effa4ebab72f9f535e44a5fbef433d087.zip FreeBSD-src-18cbcd5effa4ebab72f9f535e44a5fbef433d087.tar.gz | |
Resolve conflicts
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssl/apps/speed.c | 4 | ||||
| -rw-r--r-- | crypto/openssl/crypto/evp/evp.h | 6 | ||||
| -rw-r--r-- | crypto/openssl/crypto/idea/Makefile.save | 3 | ||||
| -rw-r--r-- | crypto/openssl/ssl/s2_srvr.c | 3 |
4 files changed, 9 insertions, 7 deletions
diff --git a/crypto/openssl/apps/speed.c b/crypto/openssl/apps/speed.c index 4a42aeb..554169c 100644 --- a/crypto/openssl/apps/speed.c +++ b/crypto/openssl/apps/speed.c @@ -84,12 +84,12 @@ #include <openssl/rand.h> #include <openssl/err.h> -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) # define USE_TOD #elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) # define TIMES #endif -#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) +#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) && !defined(__NetBSD__) # define TIMEB #endif diff --git a/crypto/openssl/crypto/evp/evp.h b/crypto/openssl/crypto/evp/evp.h index b7820be..c13b63b 100644 --- a/crypto/openssl/crypto/evp/evp.h +++ b/crypto/openssl/crypto/evp/evp.h @@ -556,9 +556,9 @@ int EVP_read_pw_string(char *buf,int length,const char *prompt,int verify); void EVP_set_pw_prompt(char *prompt); char * EVP_get_pw_prompt(void); -int EVP_BytesToKey(const EVP_CIPHER *type,EVP_MD *md,unsigned char *salt, - unsigned char *data, int datal, int count, - unsigned char *key,unsigned char *iv); +int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, + const unsigned char *salt, const unsigned char *data, int datal, + int count, unsigned char *key, unsigned char *iv); int EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type, unsigned char *key, unsigned char *iv); diff --git a/crypto/openssl/crypto/idea/Makefile.save b/crypto/openssl/crypto/idea/Makefile.save index ac32f13..8923d7d 100644 --- a/crypto/openssl/crypto/idea/Makefile.save +++ b/crypto/openssl/crypto/idea/Makefile.save @@ -40,7 +40,8 @@ all: lib lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) + @echo You may get an error following this line. Please ignore. + - $(RANLIB) $(LIB) @touch lib files: diff --git a/crypto/openssl/ssl/s2_srvr.c b/crypto/openssl/ssl/s2_srvr.c index 2f3ec61..13a9f88 100644 --- a/crypto/openssl/ssl/s2_srvr.c +++ b/crypto/openssl/ssl/s2_srvr.c @@ -407,12 +407,13 @@ static int get_client_master_key(SSL *s) /* bad decrypt */ #if 1 /* If a bad decrypt, continue with protocol but with a - * dud master secret */ + * random master secret (Bleichenbacher attack) */ if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c))) || (is_export && ((i != ek) || (s->s2->tmp.clear+i != EVP_CIPHER_key_length(c)))))) { + ERR_clear_error(); if (is_export) i=ek; else |
