diff options
author | Werner Koch <[email protected]> | 2002-05-14 16:51:00 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2002-05-14 16:51:00 +0000 |
commit | c7ceb874c28c0cae77870629f492d61340384944 (patch) | |
tree | c01b633e889a6a2b3e32d56bf4a5ccb492602863 /common | |
parent | * errors.h: Added STARUS_EXPSIG and STATUS_EXPKEYSIG. (diff) | |
download | gnupg-c7ceb874c28c0cae77870629f492d61340384944.tar.gz gnupg-c7ceb874c28c0cae77870629f492d61340384944.zip |
sm/
* gpgsm.c: New option --faked-system-time
* sign.c (gpgsm_sign): And use it here.
* certpath.c (gpgsm_validate_path): Ditto.
common/
* gettime.c: New.
agent/
* cache.c (housekeeping, agent_put_cache): Use our time() wrapper.
/
* doc/: New
* configure.ac, Makefile.am: Added doc/
Diffstat (limited to 'common')
-rw-r--r-- | common/ChangeLog | 4 | ||||
-rw-r--r-- | common/Makefile.am | 3 | ||||
-rw-r--r-- | common/gettime.c | 87 | ||||
-rw-r--r-- | common/util.h | 7 |
4 files changed, 100 insertions, 1 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index a5092f58b..1e9c9d179 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,7 @@ +2002-05-14 Werner Koch <[email protected]> + + * gettime.c: New. + 2002-05-03 Werner Koch <[email protected]> * errors.h: Added STARUS_EXPSIG and STATUS_EXPKEYSIG. diff --git a/common/Makefile.am b/common/Makefile.am index 4c3fc8947..85dcfe285 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -33,7 +33,8 @@ libcommon_a_SOURCES = \ maperror.c \ sysutils.c sysutils.h \ no-pth.c \ - cryptmiss.c + cryptmiss.c \ + gettime.c libcommon_a_LIBADD = @LIBOBJS@ diff --git a/common/gettime.c b/common/gettime.c new file mode 100644 index 000000000..6f656c8e4 --- /dev/null +++ b/common/gettime.c @@ -0,0 +1,87 @@ +/* gettime.c - Wrapper for time functions + * Copyright (C) 2002 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include <config.h> +#include <stdlib.h> +#include <time.h> + +#include "util.h" + +static unsigned long timewarp; +static enum { NORMAL = 0, FROZEN, FUTURE, PAST } timemode; + +/* Wrapper for the time(3). We use this here so we can fake the time + for tests */ +time_t +gnupg_get_time () +{ + time_t current = time (NULL); + if (timemode == NORMAL) + return current; + else if (timemode == FROZEN) + return timewarp; + else if (timemode == FUTURE) + return current + timewarp; + else + return current - timewarp; +} + +/* set the time to NEWTIME so that gnupg_get_time returns a time + starting with this one. With FREEZE set to 1 the returned time + will never change. Just for completeness, a value of (time_t)-1 + for NEWTIME gets you back to rality. Note that this is obviously + not thread-safe but this is not required. */ +void +gnupg_set_time (time_t newtime, int freeze) +{ + time_t current = time (NULL); + + if ( newtime == (time_t)-1 || current == newtime) + { + timemode = NORMAL; + timewarp = 0; + } + else if (freeze) + { + timemode = FROZEN; + timewarp = current; + } + else if (newtime > current) + { + timemode = FUTURE; + timewarp = newtime - current; + } + else + { + timemode = PAST; + timewarp = current - newtime; + } +} + +/* Returns true when we are in timewarp mode */ +int +gnupg_faked_time_p (void) +{ + return timemode; +} + + + + diff --git a/common/util.h b/common/util.h index ff20bfe15..72c847e99 100644 --- a/common/util.h +++ b/common/util.h @@ -22,6 +22,7 @@ #define GNUPG_COMMON_UTIL_H #include <gcrypt.h> /* we need this for the memory function protos */ +#include <time.h> /* we need time_t */ /* to pass hash functions to libksba we need to cast it */ #define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write) @@ -55,6 +56,12 @@ int map_kbx_err (int err); int map_assuan_err (int err); int map_to_assuan_status (int rc); +/*-- gettime.c --*/ +time_t gnupg_get_time (void); +void gnupg_set_time (time_t newtime, int freeze); +int gnupg_faked_time_p (void); + + /*-- replacement functions from funcname.c --*/ #if !HAVE_VASPRINTF #include <stdarg.h> |