diff options
Diffstat (limited to 'openaes')
| -rw-r--r-- | openaes/Android.mk | 6 | ||||
| -rw-r--r-- | openaes/src/ftime.c | 52 | ||||
| -rw-r--r-- | openaes/src/ftime.h | 35 | ||||
| -rw-r--r-- | openaes/src/oaes_lib.c | 3 |
4 files changed, 92 insertions, 4 deletions
diff --git a/openaes/Android.mk b/openaes/Android.mk index 336ebddeb..ef6fcb0bf 100644 --- a/openaes/Android.mk +++ b/openaes/Android.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true) # Build shared binary - LOCAL_SRC_FILES:= src/oaes.c \ + LOCAL_SRC_FILES:= src/oaes.c LOCAL_C_INCLUDES := \ $(commands_recovery_local_path)/openaes/src/isaac \ $(commands_recovery_local_path)/openaes/inc @@ -22,7 +22,7 @@ ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true) LOCAL_C_INCLUDES := \ $(commands_recovery_local_path)/openaes/src/isaac \ $(commands_recovery_local_path)/openaes/inc - LOCAL_SRC_FILES = src/oaes_lib.c src/isaac/rand.c + LOCAL_SRC_FILES = src/oaes_lib.c src/isaac/rand.c src/ftime.c LOCAL_SHARED_LIBRARIES = libc include $(BUILD_SHARED_LIBRARY) @@ -33,7 +33,7 @@ ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true) LOCAL_C_INCLUDES := \ $(commands_recovery_local_path)/openaes/src/isaac \ $(commands_recovery_local_path)/openaes/inc - LOCAL_SRC_FILES = src/oaes_lib.c src/isaac/rand.c + LOCAL_SRC_FILES = src/oaes_lib.c src/isaac/rand.c src/ftime.c LOCAL_STATIC_LIBRARIES = libc include $(BUILD_STATIC_LIBRARY) endif diff --git a/openaes/src/ftime.c b/openaes/src/ftime.c new file mode 100644 index 000000000..d918209da --- /dev/null +++ b/openaes/src/ftime.c @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "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 + * COPYRIGHT OWNER 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. + */ + +#include <time.h> +#include "ftime.h" + +// This was removed from POSIX 2008. +int ftime(struct timeb* tb) { + struct timeval tv; + struct timezone tz; + + if (gettimeofday(&tv, &tz) < 0) + return -1; + + tb->time = tv.tv_sec; + tb->millitm = (tv.tv_usec + 500) / 1000; + + if (tb->millitm == 1000) { + ++tb->time; + tb->millitm = 0; + } + + tb->timezone = tz.tz_minuteswest; + tb->dstflag = tz.tz_dsttime; + + return 0; +} diff --git a/openaes/src/ftime.h b/openaes/src/ftime.h new file mode 100644 index 000000000..963d7c176 --- /dev/null +++ b/openaes/src/ftime.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "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 + * COPYRIGHT OWNER 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. + */ + +// Only used by ftime, which was removed from POSIX 2008. +struct timeb { + time_t time; + unsigned short millitm; + short timezone; + short dstflag; +}; diff --git a/openaes/src/oaes_lib.c b/openaes/src/oaes_lib.c index 7cfdc1c06..6e20b478f 100644 --- a/openaes/src/oaes_lib.c +++ b/openaes/src/oaes_lib.c @@ -33,7 +33,8 @@ static const char _NR[] = { #include <stddef.h> #include <time.h> -#include <sys/timeb.h> +//#include <sys/timeb.h> +#include "ftime.h" #include <malloc.h> #include <string.h> |