Changes In Branch rfc-6234
Excluding Merge-Ins
This is equivalent to a diff from
480596d8cb
to 0d816bdcfc
Modified LICENSE
from [6315f16a70]
to [71e9e37094].
| ︙ | | |
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
-
-
-
+
+
+
|
the X Consortium, and are licensed under the X11 license: install.sh
The following files in this directory are the intellectual property of
RSA Data Security, Inc., and are licensed under terms specified
therein: md5.h, md5.c These files are "derived from the RSA Data
Security, Inc. MD5 Message-Digest Algorithm".
The following files in this directory are from RFC 3174, are the
intellectual property of the Internet Society, and are licensed under
terms specified therein: sha1.c, sha1.h
The following files in this directory are from RFC 6234, are the
intellectual property of the IETF Trust, and are licensed under
the 3-clause BSD license: sha1.c, sha.h, sha-private.h
The files in the "pkcs11/" directory are licensed under the terms of the
following licenses:
mypkcs11.h : GNU Lesser General Public License 2.1.
pkcs11.h : GNU Lesser General Public License 2.1.
pkcs11f.h : GNU Lesser General Public License 2.1.
pkcs11n.h : Mozilla Public License 2.0
|
| ︙ | | |
Modified Makefile.in
from [abdaf2d437]
to [1f902dbcec].
| ︙ | | |
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
-
+
-
+
|
$(MAKE) libcackey.@SHOBJEXT@
-$(MAKE) libcackey_g.@SHOBJEXT@
static:
$(MAKE) libcackey.a
-$(MAKE) libcackey_g.a
cackey.o: cackey.c cackey_builtin_certs.h sha1.c sha1.h md5.c md5.h asn1-x509.c asn1-x509.h config.h
cackey.o: cackey.c cackey_builtin_certs.h sha1.c sha.h sha-private.h md5.c md5.h asn1-x509.c asn1-x509.h config.h
$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) -o cackey.o -c cackey.c
cackey_g.o: cackey.c cackey_builtin_certs.h sha1.c sha1.h md5.c md5.h asn1-x509.c asn1-x509.h config.h
cackey_g.o: cackey.c cackey_builtin_certs.h sha1.c sha.h sha-private.h md5.c md5.h asn1-x509.c asn1-x509.h config.h
$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) -o cackey_g.o -c cackey.c
libcackey.@SHOBJEXT@: cackey.o
$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey.@SHOBJEXT@ cackey.o $(LIBS)
-@WEAKENSYMS@ "libcackey.@SHOBJEXT@"
-@REMOVESYMS@ "libcackey.@SHOBJEXT@"
|
| ︙ | | |
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
-
+
|
./test 2> $${tmpLogFile}; \
echo -ne "$$( \
grep 'Returned Value:' $${tmpLogFile} | sed 's@^.*/@@;s@ = {@ @;s@})$$@@;s@,@@g;s@ @\\x@g;s@\\@ \\@' | while IFS=' ' read -r count string; do \
printf '\\x%02x\\x%02x%s' $$[$${count} / 256] $$[$${count} % 256] "$${string}"; \
done \
)" > test-afl.data; rm -f $${tmpLogFile}
test-afl: test-afl.data test.c cackey.c cackey_builtin_certs.h sha1.c sha1.h md5.c md5.h asn1-x509.c asn1-x509.h config.h
test-afl: test-afl.data test.c cackey.c cackey_builtin_certs.h sha1.c sha.h sha-private.h md5.c md5.h asn1-x509.c asn1-x509.h config.h
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DCACKEY_TEST_AFL -o test-afl test.c $(patsubst -lpcsclite,,$(LIBS))
splint-cackey.txt: cackey.c cackey_builtin_certs.h asn1-x509.c asn1-x509.h config.h
splint $(DEBUGCPPFLAGS) -DCACKEY_PARANOID=1 -weak +posixlib -I/usr/include/PCSC -Ipkcs11 cackey.c > splint-cackey.txt
install: libcackey.@SHOBJEXT@
-mkdir -p "$(DESTDIR)$(libdir)"
|
| ︙ | | |
Modified cackey.c
from [60cd8b85ae]
to [11f5663297].
| ︙ | | |
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
-
+
|
#ifndef NULL_PTR
# define NULL_PTR 0
#endif
#include "pkcs11.h"
#include "pkcs11n.h"
#include "asn1-x509.h"
#include "sha1.h"
#include "sha.h"
#include "md5.h"
#ifndef CACKEY_CRYPTOKI_VERSION_CODE
# define CACKEY_CRYPTOKI_VERSION_CODE 0x021e00
#endif
/* GSC-IS v2.1 Definitions */
|
| ︙ | | |
Added sha-private.h version [b98da73ba4].
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
/************************ sha-private.h ************************/
/***************** See RFC 6234 for details. *******************/
#ifndef _SHA_PRIVATE__H
#define _SHA_PRIVATE__H
/*
* These definitions are defined in FIPS 180-3, section 4.1.
* Ch() and Maj() are defined identically in sections 4.1.1,
* 4.1.2, and 4.1.3.
*
* The definitions used in FIPS 180-3 are as follows:
*/
#ifndef USE_MODIFIED_MACROS
#define SHA_Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))
#define SHA_Maj(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
#else /* USE_MODIFIED_MACROS */
/*
* The following definitions are equivalent and potentially faster.
*/
#define SHA_Ch(x, y, z) (((x) & ((y) ^ (z))) ^ (z))
#define SHA_Maj(x, y, z) (((x) & ((y) | (z))) | ((y) & (z)))
#endif /* USE_MODIFIED_MACROS */
#define SHA_Parity(x, y, z) ((x) ^ (y) ^ (z))
#endif /* _SHA_PRIVATE__H */
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
Added sha.h version [7ecfeff9c2].