Eliminate crypto/tmdiff.[ch].
This commit is contained in:
Andy Polyakov
parent
a1ad253f17
commit
6852d1d8c3
@ -33,12 +33,12 @@ GENERAL=Makefile README crypto-lib.com install.com
|
||||
|
||||
LIB= $(TOP)/libcrypto.a
|
||||
SHARED_LIB= libcrypto$(SHLIB_EXT)
|
||||
LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c
|
||||
LIBOBJ= cryptlib.o mem.o mem_clr.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o $(CPUID_OBJ)
|
||||
LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c
|
||||
LIBOBJ= cryptlib.o mem.o mem_clr.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o $(CPUID_OBJ)
|
||||
|
||||
SRC= $(LIBSRC)
|
||||
|
||||
EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h \
|
||||
EXHEADER= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h \
|
||||
ossl_typ.h
|
||||
HEADER= cryptlib.h buildinf.h md32_common.h o_time.h o_str.h o_dir.h $(EXHEADER)
|
||||
|
||||
@ -189,13 +189,6 @@ o_str.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
|
||||
o_str.o: o_str.c o_str.h
|
||||
o_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h o_time.c
|
||||
o_time.o: o_time.h
|
||||
tmdiff.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
|
||||
tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
|
||||
tmdiff.o: ../include/openssl/err.h ../include/openssl/lhash.h
|
||||
tmdiff.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
|
||||
tmdiff.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
|
||||
tmdiff.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
|
||||
tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h tmdiff.c
|
||||
uid.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
|
||||
uid.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
|
||||
uid.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
|
||||
|
||||
260
crypto/tmdiff.c
260
crypto/tmdiff.c
@ -1,260 +0,0 @@
|
||||
/* crypto/tmdiff.c */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* "This product includes cryptographic software written by
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
* [including the GNU Public Licence.]
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "cryptlib.h"
|
||||
#include <openssl/tmdiff.h>
|
||||
#if !defined(OPENSSL_SYS_MSDOS)
|
||||
#include OPENSSL_UNISTD
|
||||
#endif
|
||||
|
||||
#ifdef TIMEB
|
||||
#undef OPENSSL_SYS_WIN32
|
||||
#undef TIMES
|
||||
#endif
|
||||
|
||||
#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32) && !(defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX_RHAPSODY) && !defined(OPENSSL_SYS_VXWORKS)
|
||||
# define TIMES
|
||||
#endif
|
||||
|
||||
#ifdef OPENSSL_SYS_NETWARE
|
||||
#undef TIMES
|
||||
#endif
|
||||
|
||||
#if !defined(_IRIX) || defined (OPENSSL_SYS_NETWARE)
|
||||
# include <time.h>
|
||||
#endif
|
||||
#ifdef TIMES
|
||||
# include <sys/types.h>
|
||||
# include <sys/times.h>
|
||||
#endif
|
||||
|
||||
/* Depending on the VMS version, the tms structure is perhaps defined.
|
||||
The __TMS macro will show if it was. If it wasn't defined, we should
|
||||
undefine TIMES, since that tells the rest of the program how things
|
||||
should be handled. -- Richard Levitte */
|
||||
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
|
||||
#undef TIMES
|
||||
#endif
|
||||
|
||||
#if defined(sun) || defined(__ultrix)
|
||||
#define _POSIX_SOURCE
|
||||
#include <limits.h>
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#if !defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_NETWARE)
|
||||
#include <sys/timeb.h>
|
||||
#endif
|
||||
|
||||
#ifdef OPENSSL_SYS_WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
/* The following if from times(3) man page. It may need to be changed */
|
||||
#ifndef HZ
|
||||
# if defined(_SC_CLK_TCK) \
|
||||
&& (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000)
|
||||
/* # define HZ ((double)sysconf(_SC_CLK_TCK)) */
|
||||
# define HZ sysconf(_SC_CLK_TCK)
|
||||
# else
|
||||
# ifndef CLK_TCK
|
||||
# ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
|
||||
# define HZ 100.0
|
||||
# else /* _BSD_CLK_TCK_ */
|
||||
# define HZ ((double)_BSD_CLK_TCK_)
|
||||
# endif
|
||||
# else /* CLK_TCK */
|
||||
# define HZ ((double)CLK_TCK)
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
struct ms_tm
|
||||
{
|
||||
#ifdef TIMES
|
||||
struct tms ms_tms;
|
||||
#else
|
||||
# ifdef OPENSSL_SYS_WIN32
|
||||
HANDLE thread_id;
|
||||
FILETIME ms_win32;
|
||||
# elif defined (OPENSSL_SYS_NETWARE)
|
||||
clock_t ms_clock;
|
||||
# else
|
||||
# ifdef OPENSSL_SYS_VXWORKS
|
||||
unsigned long ticks;
|
||||
# else
|
||||
struct timeb ms_timeb;
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
};
|
||||
|
||||
MS_TM *ms_time_new(void)
|
||||
{
|
||||
MS_TM *ret;
|
||||
|
||||
ret=(MS_TM *)OPENSSL_malloc(sizeof(MS_TM));
|
||||
if (ret == NULL)
|
||||
return(NULL);
|
||||
memset(ret,0,sizeof(MS_TM));
|
||||
#ifdef OPENSSL_SYS_WIN32
|
||||
ret->thread_id=GetCurrentThread();
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
void ms_time_free(MS_TM *a)
|
||||
{
|
||||
if (a != NULL)
|
||||
OPENSSL_free(a);
|
||||
}
|
||||
|
||||
void ms_time_get(MS_TM *tm)
|
||||
{
|
||||
#ifdef OPENSSL_SYS_WIN32
|
||||
FILETIME tmpa,tmpb,tmpc;
|
||||
#endif
|
||||
|
||||
#ifdef TIMES
|
||||
times(&tm->ms_tms);
|
||||
#else
|
||||
# ifdef OPENSSL_SYS_WIN32
|
||||
GetThreadTimes(tm->thread_id,&tmpa,&tmpb,&tmpc,&(tm->ms_win32));
|
||||
# elif defined (OPENSSL_SYS_NETWARE)
|
||||
tm->ms_clock = clock();
|
||||
# else
|
||||
# ifdef OPENSSL_SYS_VXWORKS
|
||||
tm->ticks = tickGet();
|
||||
# else
|
||||
ftime(&tm->ms_timeb);
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
}
|
||||
|
||||
double ms_time_diff(MS_TM *a, MS_TM *b)
|
||||
{
|
||||
double ret;
|
||||
|
||||
#ifdef TIMES
|
||||
ret = HZ;
|
||||
ret = (b->ms_tms.tms_utime-a->ms_tms.tms_utime) / ret;
|
||||
#else
|
||||
# ifdef OPENSSL_SYS_WIN32
|
||||
{
|
||||
#ifdef __GNUC__
|
||||
signed long long la,lb;
|
||||
#else
|
||||
signed _int64 la,lb;
|
||||
#endif
|
||||
la=a->ms_win32.dwHighDateTime;
|
||||
lb=b->ms_win32.dwHighDateTime;
|
||||
la<<=32;
|
||||
lb<<=32;
|
||||
la+=a->ms_win32.dwLowDateTime;
|
||||
lb+=b->ms_win32.dwLowDateTime;
|
||||
ret=((double)(lb-la))/1e7;
|
||||
}
|
||||
# elif defined (OPENSSL_SYS_NETWARE)
|
||||
ret= (double)(b->ms_clock - a->ms_clock);
|
||||
# else
|
||||
# ifdef OPENSSL_SYS_VXWORKS
|
||||
ret = (double)(b->ticks - a->ticks) / (double)sysClkRateGet();
|
||||
# else
|
||||
ret= (double)(b->ms_timeb.time-a->ms_timeb.time)+
|
||||
(((double)b->ms_timeb.millitm)-
|
||||
((double)a->ms_timeb.millitm))/1000.0;
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
return((ret < 0.0000001)?0.0000001:ret);
|
||||
}
|
||||
|
||||
int ms_time_cmp(const MS_TM *a, const MS_TM *b)
|
||||
{
|
||||
double d;
|
||||
int ret;
|
||||
|
||||
#ifdef TIMES
|
||||
d = HZ;
|
||||
d = (b->ms_tms.tms_utime-a->ms_tms.tms_utime) / d;
|
||||
#else
|
||||
# ifdef OPENSSL_SYS_WIN32
|
||||
d =(b->ms_win32.dwHighDateTime&0x000fffff)*10+b->ms_win32.dwLowDateTime/1e7;
|
||||
d-=(a->ms_win32.dwHighDateTime&0x000fffff)*10+a->ms_win32.dwLowDateTime/1e7;
|
||||
# elif defined (OPENSSL_SYS_NETWARE)
|
||||
d= (double)(b->ms_clock - a->ms_clock);
|
||||
# else
|
||||
# ifdef OPENSSL_SYS_VXWORKS
|
||||
d = (b->ticks - a->ticks);
|
||||
# else
|
||||
d= (double)(b->ms_timeb.time-a->ms_timeb.time)+
|
||||
(((double)b->ms_timeb.millitm)-(double)a->ms_timeb.millitm)/1000.0;
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
if (d == 0.0)
|
||||
ret=0;
|
||||
else if (d < 0)
|
||||
ret= -1;
|
||||
else
|
||||
ret=1;
|
||||
return(ret);
|
||||
}
|
||||
|
||||
@ -1,93 +0,0 @@
|
||||
/* crypto/tmdiff.h */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* "This product includes cryptographic software written by
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
* [including the GNU Public Licence.]
|
||||
*/
|
||||
|
||||
/* Header for dynamic hash table routines
|
||||
* Author - Eric Young
|
||||
*/
|
||||
/* ... erm yeah, "dynamic hash tables" you say?
|
||||
*
|
||||
* And what would dynamic hash tables have to do with any of this code *now*?
|
||||
* AFAICS, this code is only referenced by crypto/bn/exp.c which is an unused
|
||||
* file that I doubt compiles any more. speed.c is the only thing that could
|
||||
* use this (and it has nothing to do with hash tables), yet it instead has its
|
||||
* own duplication of all this stuff and looks, if anything, more complete. See
|
||||
* the corresponding note in apps/speed.c.
|
||||
* The Bemused - Geoff
|
||||
*/
|
||||
|
||||
#ifndef HEADER_TMDIFF_H
|
||||
#define HEADER_TMDIFF_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct ms_tm MS_TM;
|
||||
|
||||
MS_TM *ms_time_new(void );
|
||||
void ms_time_free(MS_TM *a);
|
||||
void ms_time_get(MS_TM *a);
|
||||
double ms_time_diff(MS_TM *start, MS_TM *end);
|
||||
int ms_time_cmp(const MS_TM *ap, const MS_TM *bp);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user