Permalink
Browse files

continuing merge from jesup, several minor fixes

  • Loading branch information...
davidmcgrew committed Sep 23, 2005
1 parent 28b5915 commit fec49ddc1df930773054cffb9b4c5ba3f4a3af59
View
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2001-2003 Cisco Systems, Inc.
+ * Copyright (c) 2001-2005 Cisco Systems, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
View
@@ -70,6 +70,10 @@ kernel = crypto/kernel/crypto_kernel.o crypto/kernel/alloc.o \
cryptobj = $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay)
+aesicm = crypto/cipher/cipher.o crypto/cipher/aes.o crypto/cipher/aes_icm.o \
+ crypto/hash/auth.o crypto/kernel/alloc.o crypto/kernel/err.o \
+ crypto/math/datatypes.o crypto/replay/rdbx.o
+
aesicmobj = $(aesicm) $(rng)
# gdoi is the group domain of interpretation for isakmp, a group key
@@ -176,7 +180,7 @@ install:
uninstall:
rm -rf /usr/local/include/srtp
rm -rf /usr/local/lib/libsrtp.a
- if [ -f libaesicm.a ]; then rm -rf /usr/local/lib/libaesicm.a; fi
+ rm -rf /usr/local/lib/libaesicm.a
clean:
rm -rf $(cryptobj) $(srtpobj) $(cryptomath) $(table_apps) TAGS \
View
28 TODO
@@ -1,5 +1,18 @@
TODO List
+1.4.1
+
+ - document which fields are in NBO/HBO, and check for consistency.
+
+ - move HAVE_U_LONG_LONG inside of datatypes.c, or some other
+ separate file
+
+ - re-write configure.in to make cross-compilation easier
+
+ - eliminate GENERIC_AESICM by generalizing the code a bit
+
+Older comments
+
- add tests for key_limit_t datatype
- move octet_get_weight() from datatypes.c to math.c (any other
@@ -10,11 +23,6 @@ Changes and additions planned
Make cipher and auth dealloc() functions zeroize the key-storage
areas before calling free().
- Fix UST
- - implement scatter/gather API
- - SRTP using UST
- - possibly add legacy SHA1 usage
-
Eliminate key_len from auth_init()
Doucument internal APIs (cipher, auth, srtp_protect, ...)
@@ -23,18 +31,13 @@ Changes and additions planned
SRTP options not (yet) included in this libaray:
- the aes-f8-mode cipher
- - HMAC-SHA-1
- the Master Key Index
- re-keying using the key derivation function (only the initial
use of the PRF has been implemented, as it's sufficient
for most uses)
-INCOMPLETE ADDITIONS
-
- Added DES and 3DES ICM.
-
-PLANNED CHANGES
+(OLD) PLANNED CHANGES
strip out test/lfsr.c
@@ -61,6 +64,3 @@ PLANNED CHANGES
Consider eliminating low-level alloc functions in favor of len()
functions, so that there need not be multiple allocations within a
particular alloc() function.
-
- Update test/stat-driver.c so that it tests the rand_source API.
- Add a pseudorandom rand_source.
View
@@ -1 +1 @@
-1.4.0
+1.4.2
View
@@ -1,7 +1,7 @@
/*
* config_in.h
*
- * template for header config file for Secure RTP and UST implementation
+ * template for header config file for Secure RTP and libcryptomodule
*
* David A. McGrew
* Cisco Systems, Inc.
@@ -21,6 +21,10 @@
#define HAVE_MACHINE_TYPES_H 0
#define HAVE_SYS_INT_TYPES_H 0
+/* check if an unsigned 64-bit integer is supported natively */
+
+#define HAVE_U_LONG_LONG 0
+
/* check for microsoft integer definitions (e.g., cygwin) */
#define HAVE_MS_TYPES 1
@@ -82,15 +86,15 @@
#define CPU_ALTIVEC 0
/*
- * if /dev/random is available, then DEV_RANDOM == 1
+ * if /dev/urandom is available, then DEV_URANDOM == 1
*
- * /dev/random is a (true) random number generator which is
+ * /dev/urandom is a (true) random number generator which is
* implemented in many modern operating systems
*/
-#define DEV_RANDOM 0
+#define DEV_URANDOM 0
-/* check for stdlib.h - we use it for xalloc() and free() */
+/* check for stdlib.h - we use it for alloc() and free() */
#define HAVE_STDLIB_H 0
Oops, something went wrong.

0 comments on commit fec49dd

Please sign in to comment.