diff options
| -rw-r--r-- | Makefile.org | 4 | ||||
| -rw-r--r-- | ssl/s3_lib.c | 2 | ||||
| -rw-r--r-- | ssl/t1_lib.c | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/Makefile.org b/Makefile.org index 235f2a8754..cce2cc4bf7 100644 --- a/Makefile.org +++ b/Makefile.org @@ -180,7 +180,7 @@ all: Makefile.ssl (cd $$i && echo "making all in $$i..." && \ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ done - cd crypto; $(MAKE) testapps + cd crypto; $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' testapps -@# cd perl; $(PERL) Makefile.PL; make sub_all: @@ -299,7 +299,7 @@ util/libeay.num:: util/ssleay.num:: perl util/mkdef.pl ssl update -crypto/objects/obj_dat.h:: +crypto/objects/obj_dat.h: crypto/objects/objects.h crypto/objects/obj_dat.pl perl crypto/objects/obj_dat.pl crypto/objects/objects.h crypto/objects/obj_dat.h TABLE: Configure diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index aeff6b5c5b..1ff796b71e 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -1092,7 +1092,7 @@ int ssl3_renegotiate_check(SSL *s) { /* if we are the server, and we have sent a 'RENEGOTIATE' message, we -need to go to SSL_ST_ACCEPT. +need to go to SSL_ST_ACCEPT. */ /* SSL_ST_ACCEPT */ s->state=SSL_ST_RENEGOTIATE; diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index ddf5c15799..b734528da0 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -62,11 +62,7 @@ char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT; -#ifndef NO_PROTO static long tls1_default_timeout(void); -#else -static long tls1_default_timeout(); -#endif static SSL3_ENC_METHOD TLSv1_enc_data={ tls1_enc, |