Fix NEWS blurb. Shorten new API name.

5 files changed, 22 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index 29af4e8ec7..b2ef2f85b7 100644
--- a/NEWS
+++ b/NEWS
@@ -12,16 +12,18 @@ Reported by Tang Tong.
 ** extension and certificate verify field.
 This requires changes for TLS 1.2 servers and clients that use
 callbacks for certificate retrieval.  They are now required to check
-with gnutls_session_sign_algorithm_get_requested() whether the
-certificate they send complies with the peer's preferences in
-signature algorithms.
+with gnutls_sign_algorithm_get_requested() whether the certificate
+they send complies with the peer's preferences in signature
+algorithms.
 
 ** libgnutls: In server side when resuming a session do not overwrite the 
 ** initial session data with the resumed session data.
 
 ** libgnutls: Added support for AES-128, AES-192 and AES-256 in PKCS #8
 ** encryption.
-This affects also PKCS #12 encoded files.
+This affects also PKCS #12 encoded files.  This adds the following new
+enums: GNUTLS_CIPHER_AES_192_CBC, GNUTLS_PKCS_USE_PBES2_AES_128,
+GNUTLS_PKCS_USE_PBES2_AES_192, GNUTLS_PKCS_USE_PBES2_AES_256.
 
 ** libgnutls: Fix PKCS#12 encoding.
 The error you would get was "The OID is not supported.".  Problem
@@ -42,7 +44,13 @@ Reported by Andreas Metzler <ametzler@downhill.at.eu.org> in
 Thanks to Clytie Siddall.
 
 ** API and ABI modifications:
-No changes since last version.
+GNUTLS_CIPHER_AES_192_CBC: ADDED to gnutls/gnutls.h.
+GNUTLS_PKCS_USE_PBES2_AES_128: ADDED to gnutls/x509.h.
+GNUTLS_PKCS_USE_PBES2_AES_192: ADDED to gnutls/x509.h.
+GNUTLS_PKCS_USE_PBES2_AES_256: ADDED to gnutls/x509.h.
+GNUTLS_BAG_SECRET: ADDED to gnutls/pkcs12.h.
+GNUTLS_DIG_UNKNOWN: ADDED to gnutls/gnutls.h.
+gnutls_sign_algorithm_get_requested: ADDED.
 
 * Version 2.9.7 (released 2009-10-06)
 
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index b894f7e9e9..48d602daca 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -43,6 +43,7 @@ APIMANS += gnutls_server_name_set.3
 APIMANS += gnutls_session_ticket_key_generate.3
 APIMANS += gnutls_session_ticket_enable_client.3
 APIMANS += gnutls_session_ticket_enable_server.3
+APIMANS += gnutls_session_sign_algorithm_get_requested.3
 APIMANS += gnutls_alert_get_name.3
 APIMANS += gnutls_alert_send.3
 APIMANS += gnutls_error_to_alert.3
diff --git a/lib/ext_signature.c b/lib/ext_signature.c
index 69037eb0b2..9be866dd3e 100644
--- a/lib/ext_signature.c
+++ b/lib/ext_signature.c
@@ -284,7 +284,7 @@ _gnutls_session_sign_algo_enabled (gnutls_session_t session,
 }
 
 /**
- * gnutls_session_sign_algorithm_get - get signature algorithms requested by peer
+ * gnutls_sign_algorithm_get - get signature algorithms requested by peer
  * @session: is a #gnutls_session_t structure.
  * @indx: is an index of the signature algorithm to return
  * @algo: the returned certificate type will be stored there
@@ -305,9 +305,9 @@ _gnutls_session_sign_algo_enabled (gnutls_session_t session,
  * Since: 2.10.0
  **/
 int
-gnutls_session_sign_algorithm_get_requested (gnutls_session_t session,
-					     size_t indx,
-					     gnutls_sign_algorithm_t * algo)
+gnutls_sign_algorithm_get_requested (gnutls_session_t session,
+				     size_t indx,
+				     gnutls_sign_algorithm_t * algo)
 {
   gnutls_protocol_t ver = gnutls_protocol_get_version (session);
 
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index e038a5dc00..115a3fe318 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -403,8 +403,9 @@ extern "C" {
   gnutls_compression_get (gnutls_session_t session);
   gnutls_certificate_type_t
   gnutls_certificate_type_get (gnutls_session_t session);
-  int gnutls_session_sign_algorithm_get_requested (gnutls_session_t session,
-                    int indx, gnutls_sign_algorithm_t *algo);
+  int gnutls_sign_algorithm_get_requested (gnutls_session_t session,
+					   size_t indx,
+					   gnutls_sign_algorithm_t *algo);
 
   size_t gnutls_cipher_get_key_size (gnutls_cipher_algorithm_t algorithm);
   size_t gnutls_mac_get_key_size (gnutls_mac_algorithm_t algorithm);
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 3c9b72773f..5e6f78d26d 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -579,7 +579,7 @@ GNUTLS_2_10
     gnutls_x509_crt_get_issuer_alt_name2;
     gnutls_x509_crt_get_issuer_alt_name;
     gnutls_x509_crt_get_issuer_alt_othername_oid;
-    gnutls_session_sign_algorithm_get_requested;
+    gnutls_sign_algorithm_get_requested;
 } GNUTLS_2_8;
 
 GNUTLS_PRIVATE {