From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 1 Nov 2012 14:42:41 +0000 (+0100)
Subject: documented update and set the copyright to Martin until the formal papers are received.
X-Git-Tag: gnutls_3_1_4~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=246cca645f3deeb86909f219a6e25e80ff24b088;p=thirdparty%2Fgnutls.git

documented update and set the copyright to Martin until the formal papers are received.
---

diff --git a/NEWS b/NEWS
index b89d6e0f86..d4bda8c5d8 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ the available revocation data validity.
 ** libgnutls: Simplified certificate verification by adding
 gnutls_certificate_verify_peers3().
 
+** libgnutls: Added support for extension to establish keys
+for SRTP.
+
 ** gnutls-cli: Added --local-dns option.
 
 ** danetool: Corrected bug that prevented loading PEM files.
@@ -23,15 +26,15 @@ gnutls_session_get_id2: Added
 gnutls_certificate_update_verify_flags: Added
 gnutls_certificate_verify_peers3: Added
 gnutls_certificate_verification_status_print: Added
-GNUTLS_CERT_REVOCATION_DATA_TOO_OLD: Added
-GNUTLS_CERT_REVOCATION_DATA_INVALID: Added
-GNUTLS_CERT_UNEXPECTED_OWNER: Added
-gnutls_srtp_profile_t: Added
 gnutls_srtp_set_profile: Added
 gnutls_srtp_set_profile_direct: Added
 gnutls_srtp_get_selected_profile: Added
 gnutls_srtp_get_profile_name: Added
 gnutls_srtp_get_profile_by_name: Added
+gnutls_srtp_profile_t: Added
+GNUTLS_CERT_REVOCATION_DATA_TOO_OLD: Added
+GNUTLS_CERT_REVOCATION_DATA_INVALID: Added
+GNUTLS_CERT_UNEXPECTED_OWNER: Added
 
 * Version 3.1.3 (released 2012-10-12)
 
diff --git a/lib/ext/srtp.c b/lib/ext/srtp.c
index 46a870a0a0..c7b0e8663d 100644
--- a/lib/ext/srtp.c
+++ b/lib/ext/srtp.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012 Free Software Foundation, Inc.
- *
+ * Copyright (C) 2012 Martin Storsjo
+ * 
  * Author: Martin Storsjo
  *
  * This file is part of GnuTLS.
diff --git a/lib/ext/srtp.h b/lib/ext/srtp.h
index 4a8dc815ba..42a097e143 100644
--- a/lib/ext/srtp.h
+++ b/lib/ext/srtp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Free Software Foundation, Inc.
+ * Copyright (C) 2012 Martin Storsjo
  *
  * Author: Martin Storsjo
  *