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