author | Jan Parcel <jan.parcel@oracle.com> |
Wed, 06 Jul 2016 18:48:42 -0700 | |
branch | s11u3-sru |
changeset 6364 | fd8be207f137 |
permissions | -rw-r--r-- |
6364
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch created to clear any merge conflicts from source in archive |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
2 |
repo to build properly on Solaris. |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
3 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
4 |
Removed objcopy commands due to upstream bug affecting buildenv on Solaris. |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
5 |
objcopy breaks sh_link and sh_info of SHT_SUNW_LDYNSYM and SHT_SUNW_symsort sections |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
6 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
7 |
Renamed test program output to "testcackey" for internal functional testing use and |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
8 |
renamed test target to "build-test" to remove ambiguity with userland buildenv test target. |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
9 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
10 |
Removed the test-afl.data and test.afl targets as they are not being used with our test cases |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
11 |
and also contained merge conflict markers. |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
12 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
13 |
--- CACKey-0.7.4/Makefile.in 2016-06-16 10:16:46.396593461 -0400 |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
14 |
+++ CACKey-0.7.4/Makefile.in 2016-06-23 12:16:17.380726632 -0400 |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
15 |
@@ -26,31 +26,13 @@ |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
16 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
17 |
libcackey.@SHOBJEXT@: cackey.o |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
18 |
$(CC) $(SHOBJFLAGS) $(CPPFLAGS) $(CFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey.@SHOBJEXT@ cackey.o $(LIBS) |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
19 |
- -@WEAKENSYMS@ "libcackey.@SHOBJEXT@" |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
20 |
- -@REMOVESYMS@ "libcackey.@SHOBJEXT@" |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
21 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
22 |
libcackey_g.@SHOBJEXT@: cackey_g.o |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
23 |
$(CC) $(SHOBJFLAGS) $(DEBUGCPPFLAGS) $(DEBUGCFLAGS) $(SHOBJLDFLAGS) $(LDFLAGS) -o libcackey_g.@SHOBJEXT@ cackey_g.o $(LIBS) |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
24 |
- -@WEAKENSYMS@ "libcackey_g.@SHOBJEXT@" |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
25 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
26 |
-test: test.c libcackey_g.@SHOBJEXT@ |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
27 |
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o test test.c -Wl,-R,. libcackey_g.@SHOBJEXT@ |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
28 |
+build-test: test.c libcackey_g.@SHOBJEXT@ |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
29 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o testcackey test.c -Wl,-R,. libcackey_g.@SHOBJEXT@ |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
30 |
|
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
31 |
-<<<<<<< HEAD |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
32 |
-======= |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
33 |
-test-afl.data: test |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
34 |
- tmpLogFile='log.$(shell openssl rand -hex 16)'; \ |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
35 |
- ./test 2> $${tmpLogFile}; \ |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
36 |
- echo -ne "$$( \ |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
37 |
- grep 'Returned Value:' $${tmpLogFile} | sed 's@^.*/@@;s@ = {@ @;s@})$$@@;s@,@@g;s@ @\\x@g;s@\\@ \\@' | while IFS=' ' read -r count string; do \ |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
38 |
- printf '\\x%02x\\x%02x%s' $$[$${count} / 256] $$[$${count} % 256] "$${string}"; \ |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
39 |
- done \ |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
40 |
- )" > test-afl.data; rm -f $${tmpLogFile} |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
41 |
- |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
42 |
-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 |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
43 |
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DCACKEY_TEST_AFL -o test-afl test.c $(patsubst -lpcsclite,,$(LIBS)) |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
44 |
- |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
45 |
->>>>>>> trunk |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
46 |
splint-cackey.txt: cackey.c cackey_builtin_certs.h asn1-x509.c asn1-x509.h config.h |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
47 |
splint $(DEBUGCPPFLAGS) -DCACKEY_PARANOID=1 -weak +posixlib -I/usr/include/PCSC -Ipkcs11 cackey.c > splint-cackey.txt |
fd8be207f137
PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
48 |