[SCM] GNU gnutls branch, master, updated. gnutls_3_0_21-90-g402169e

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=402169e5c31e5d79b18553269ac036545533313d

The branch, master has been updated
       via  402169e5c31e5d79b18553269ac036545533313d (commit)
       via  41c92e045381558f4be3ea5d961ee401954f1330 (commit)
      from  458d80a1c4f31b4aa27da2c3e3202167dffc2e90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 402169e5c31e5d79b18553269ac036545533313d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Aug 4 22:25:22 2012 +0200

    corrected typo

commit 41c92e045381558f4be3ea5d961ee401954f1330
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Aug 4 22:17:02 2012 +0200

    bumped version

-----------------------------------------------------------------------

Summary of changes:
 configure.ac            |    2 +-
 lib/gnutls_rsa_export.c |    8 ++++----
 m4/hooks.m4             |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0e62e4b..791da92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [3.1.0], address@hidden)
+AC_INIT([GnuTLS], [3.1.0pre0], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/gnutls_rsa_export.c b/lib/gnutls_rsa_export.c
index 63bd782..c88aee4 100644
--- a/lib/gnutls_rsa_export.c
+++ b/lib/gnutls_rsa_export.c
@@ -149,10 +149,10 @@ gnutls_rsa_params_generate2 (gnutls_rsa_params_t params, 
unsigned int bits)
 /**
  * gnutls_rsa_params_import_pkcs1:
  * @params: A structure where the parameters will be copied to
- * @pkcs1_params: should contain a PKCS1 RSAPublicKey structure PEM or DER 
encoded
+ * @pkcs1_params: should contain a PKCS1 RSAPrivateKey structure PEM or DER 
encoded
  * @format: the format of params. PEM or DER.
  *
- * This function will extract the RSAPublicKey found in a PKCS1 formatted
+ * This function will extract the RSAPrivateKey found in a PKCS1 formatted
  * structure.
  *
  * If the structure is PEM encoded, it should have a header
@@ -172,11 +172,11 @@ gnutls_rsa_params_import_pkcs1 (gnutls_rsa_params_t 
params,
  * gnutls_rsa_params_export_pkcs1:
  * @params: Holds the RSA parameters
  * @format: the format of output params. One of PEM or DER.
- * @params_data: will contain a PKCS1 RSAPublicKey structure PEM or DER encoded
+ * @params_data: will contain a PKCS1 RSAPrivateKey structure PEM or DER 
encoded
  * @params_data_size: holds the size of params_data (and will be replaced by 
the actual size of parameters)
  *
  * This function will export the given RSA parameters to a PKCS1
- * RSAPublicKey structure. If the buffer provided is not long enough to
+ * RSAPrivateKey structure. If the buffer provided is not long enough to
  * hold the output, then GNUTLS_E_SHORT_MEMORY_BUFFER will be returned.
  *
  * If the structure is PEM encoded, it will have a header
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index ccf8b76..ed5cb2f 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -39,17 +39,17 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces changed/added/removed:   CURRENT++       REVISION=0
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
-  AC_SUBST(LT_CURRENT, 36)
+  AC_SUBST(LT_CURRENT, 39)
   AC_SUBST(LT_REVISION, 0)
-  AC_SUBST(LT_AGE, 8)
+  AC_SUBST(LT_AGE, 11)
 
   AC_SUBST(LT_SSL_CURRENT, 27)
   AC_SUBST(LT_SSL_REVISION, 2)
   AC_SUBST(LT_SSL_AGE, 0)
 
-  AC_SUBST(CXX_LT_CURRENT, 28)
+  AC_SUBST(CXX_LT_CURRENT, 29)
   AC_SUBST(CXX_LT_REVISION, 0)
-  AC_SUBST(CXX_LT_AGE, 0)
+  AC_SUBST(CXX_LT_AGE, 1)
 
   AC_SUBST(CRYWRAP_PATCHLEVEL, 3)
 


hooks/post-receive
-- 
GNU gnutls