1diff -purN -x CVS -x '*~' -x '.*' -x 'obj-*' srtp-win/Makefile.in srtp/Makefile.in
2--- srtp-win/Makefile.in	2007-06-15 14:17:39.000000000 -0400
3+++ srtp/Makefile.in	2009-04-22 18:25:43.000000000 -0400
4@@ -26,7 +26,7 @@ runtest: build_table_apps test
5 	test/roc_driver$(EXE) -v >/dev/null
6 	test/replay_driver$(EXE) -v >/dev/null
7 	test/dtls_srtp_driver$(EXE) >/dev/null
8-	cd test; ./rtpw_test.sh >/dev/null
9+	cd test; $(abspath $(srcdir))/test/rtpw_test.sh >/dev/null
10 	@echo "libsrtp test applications passed."
11 	$(MAKE) -C crypto runtest
12
13@@ -189,18 +189,20 @@ libsrtpdoc:
14 .PHONY: clean superclean install
15
16 install:
17-	@if [ -d $(DESTDIR)$(includedir)/srtp ]; then \
18+	@if [ -r $(DESTDIR)$(includedir)/srtp/srtp.h ]; then \
19 	   echo "you should run 'make uninstall' first"; exit 1;  \
20 	fi
21 	$(INSTALL) -d $(DESTDIR)$(includedir)/srtp
22 	$(INSTALL) -d $(DESTDIR)$(libdir)
23-	cp include/*.h $(DESTDIR)$(includedir)/srtp
24-	cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp
25+	cp $(srcdir)/include/*.h $(DESTDIR)$(includedir)/srtp
26+	cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
27+	if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
28 	if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
29
30 uninstall:
31-	rm -rf $(DESTDIR)$(includedir)/srtp
32-	rm -rf $(DESTDIR)$(libdir)/libsrtp.a
33+	rm -f $(DESTDIR)$(includedir)/srtp/*.h
34+	rm -f $(DESTDIR)$(libdir)/libsrtp.a
35+	-rmdir $(DESTDIR)$(includedir)/srtp
36
37 clean:
38 	rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \
39diff -purN -x CVS -x '*~' -x '.*' -x 'obj-*' srtp-win/srtp/ekt.c srtp/srtp/ekt.c
40--- srtp-win/srtp/ekt.c	2009-04-22 18:47:06.000000000 -0400
41+++ srtp/srtp/ekt.c	2009-04-22 18:50:51.000000000 -0400
42@@ -131,6 +131,9 @@ ekt_alloc(ekt_stream_t *stream_data, ekt
43     return err_status_ok;
44   }
45
46+  /* TODO */
47+  *stream_data = NULL;
48+
49   return err_status_ok;
50 }
51
52diff -purN -x CVS -x '*~' -x '.*' -x 'obj-*' srtp-win/test/dtls_srtp_driver.c srtp/test/dtls_srtp_driver.c
53--- srtp-win/test/dtls_srtp_driver.c	2006-07-17 16:41:22.000000000 -0400
54+++ srtp/test/dtls_srtp_driver.c	2009-04-23 15:50:26.000000000 -0400
55@@ -183,6 +183,7 @@ test_dtls_srtp() {
56   err = crypto_policy_set_from_profile_for_rtcp(&policy.rtcp, profile);
57   if (err) return err;
58   policy.ssrc.type  = ssrc_any_inbound;
59+  policy.ekt = NULL;
60   policy.next = NULL;
61
62   err = srtp_add_stream(s, &policy);
63diff -purN -x CVS -x '*~' -x '.*' -x 'obj-*' srtp-win/test/rtpw_test.sh srtp/test/rtpw_test.sh
64--- srtp-win/test/rtpw_test.sh	2006-06-13 11:17:57.000000000 -0400
65+++ srtp/test/rtpw_test.sh	2009-04-22 18:30:27.000000000 -0400
66@@ -4,7 +4,7 @@
67 #
68 # tests the rtpw sender and receiver functions
69
70-RTPW=rtpw
71+RTPW=./rtpw
72 DEST_PORT=9999
73 DURATION=3
74
75@@ -18,7 +18,7 @@ ARGS="-k $key -ae"
76 # they are killed, those processes will linger.  Re-running the script
77 # will get rid of them.
78
79-killall rtpw 2&>/dev/null
80+killall rtpw 2>/dev/null
81
82 if test -x $RTPW; then
83
84diff -purN -x CVS -x '*~' -x '.*' -x 'obj-*' srtp-win/test/srtp_driver.c srtp/test/srtp_driver.c
85--- srtp-win/test/srtp_driver.c	2007-06-15 14:17:40.000000000 -0400
86+++ srtp/test/srtp_driver.c	2009-04-22 18:20:27.000000000 -0400
87@@ -153,7 +153,7 @@ main (int argc, char *argv[]) {
88   if (sizeof(srtp_hdr_t) != 12) {
89      printf("error: srtp_hdr_t has incorrect size"
90 	    "(size is %ld bytes, expected 12)\n",
91-	    sizeof(srtp_hdr_t));
92+	    (long)sizeof(srtp_hdr_t));
93     exit(1);
94   }
95
96