[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-117-g9952a5d
From: |
Nikos Mavrogiannopoulos |
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-117-g9952a5d |
Date: |
Fri, 21 Sep 2012 19:38:27 +0000 |
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=9952a5deea2104bec53a8e62a25bf4870d031e56
The branch, master has been updated
via 9952a5deea2104bec53a8e62a25bf4870d031e56 (commit)
via 4dfb2f7c7a432240808baf145462ba6266169a01 (commit)
from a58bfa74085aa130c991ec18598583918e10c0d2 (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 9952a5deea2104bec53a8e62a25bf4870d031e56
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Sep 21 21:36:56 2012 +0200
All openpgp code moved within ENABLE_OPENPGP
commit 4dfb2f7c7a432240808baf145462ba6266169a01
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Sep 21 19:46:39 2012 +0200
updated makefiles
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.am | 30 ++++++-----
doc/manpages/Makefile.am | 15 +++---
lib/gnutls_privkey.c | 121 +++++++++++++++++++++++-----------------------
3 files changed, 85 insertions(+), 81 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1287d12..7fc802a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -806,12 +806,14 @@ FUNCS += functions/gnutls_heartbeat_allowed
FUNCS += functions/gnutls_heartbeat_allowed.short
FUNCS += functions/gnutls_heartbeat_enable
FUNCS += functions/gnutls_heartbeat_enable.short
+FUNCS += functions/gnutls_heartbeat_get_timeout
+FUNCS += functions/gnutls_heartbeat_get_timeout.short
FUNCS += functions/gnutls_heartbeat_ping
FUNCS += functions/gnutls_heartbeat_ping.short
-FUNCS += functions/gnutls_heartbeat_ping_rnd
-FUNCS += functions/gnutls_heartbeat_ping_rnd.short
-FUNCS += functions/gnutls_heartbeat_timeout
-FUNCS += functions/gnutls_heartbeat_timeout.short
+FUNCS += functions/gnutls_heartbeat_pong
+FUNCS += functions/gnutls_heartbeat_pong.short
+FUNCS += functions/gnutls_heartbeat_set_timeouts
+FUNCS += functions/gnutls_heartbeat_set_timeouts.short
FUNCS += functions/gnutls_hex2bin
FUNCS += functions/gnutls_hex2bin.short
FUNCS += functions/gnutls_hex_decode
@@ -1076,6 +1078,14 @@ FUNCS += functions/gnutls_pk_algorithm_get_name
FUNCS += functions/gnutls_pk_algorithm_get_name.short
FUNCS += functions/gnutls_pk_bits_to_sec_param
FUNCS += functions/gnutls_pk_bits_to_sec_param.short
+FUNCS += functions/gnutls_pk_get_id
+FUNCS += functions/gnutls_pk_get_id.short
+FUNCS += functions/gnutls_pk_get_name
+FUNCS += functions/gnutls_pk_get_name.short
+FUNCS += functions/gnutls_pk_list
+FUNCS += functions/gnutls_pk_list.short
+FUNCS += functions/gnutls_pk_to_sign
+FUNCS += functions/gnutls_pk_to_sign.short
FUNCS += functions/gnutls_pkcs11_add_provider
FUNCS += functions/gnutls_pkcs11_add_provider.short
FUNCS += functions/gnutls_pkcs11_copy_secret_key
@@ -1222,14 +1232,6 @@ FUNCS += functions/gnutls_pkcs7_set_crt
FUNCS += functions/gnutls_pkcs7_set_crt.short
FUNCS += functions/gnutls_pkcs7_set_crt_raw
FUNCS += functions/gnutls_pkcs7_set_crt_raw.short
-FUNCS += functions/gnutls_pk_get_id
-FUNCS += functions/gnutls_pk_get_id.short
-FUNCS += functions/gnutls_pk_get_name
-FUNCS += functions/gnutls_pk_get_name.short
-FUNCS += functions/gnutls_pk_list
-FUNCS += functions/gnutls_pk_list.short
-FUNCS += functions/gnutls_pk_to_sign
-FUNCS += functions/gnutls_pk_to_sign.short
FUNCS += functions/gnutls_prf
FUNCS += functions/gnutls_prf.short
FUNCS += functions/gnutls_prf_raw
@@ -1898,10 +1900,10 @@ FUNCS += functions/gnutls_x509_crt_set_pubkey
FUNCS += functions/gnutls_x509_crt_set_pubkey.short
FUNCS += functions/gnutls_x509_crt_set_serial
FUNCS += functions/gnutls_x509_crt_set_serial.short
-FUNCS += functions/gnutls_x509_crt_set_subject_alternative_name
-FUNCS += functions/gnutls_x509_crt_set_subject_alternative_name.short
FUNCS += functions/gnutls_x509_crt_set_subject_alt_name
FUNCS += functions/gnutls_x509_crt_set_subject_alt_name.short
+FUNCS += functions/gnutls_x509_crt_set_subject_alternative_name
+FUNCS += functions/gnutls_x509_crt_set_subject_alternative_name.short
FUNCS += functions/gnutls_x509_crt_set_subject_key_id
FUNCS += functions/gnutls_x509_crt_set_subject_key_id.short
FUNCS += functions/gnutls_x509_crt_set_version
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 19af557..ff952ef 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -231,9 +231,10 @@ APIMANS += gnutls_hash_init.3
APIMANS += gnutls_hash_output.3
APIMANS += gnutls_heartbeat_allowed.3
APIMANS += gnutls_heartbeat_enable.3
+APIMANS += gnutls_heartbeat_get_timeout.3
APIMANS += gnutls_heartbeat_ping.3
-APIMANS += gnutls_heartbeat_ping_rnd.3
-APIMANS += gnutls_heartbeat_timeout.3
+APIMANS += gnutls_heartbeat_pong.3
+APIMANS += gnutls_heartbeat_set_timeouts.3
APIMANS += gnutls_hex2bin.3
APIMANS += gnutls_hex_decode.3
APIMANS += gnutls_hex_encode.3
@@ -366,6 +367,10 @@ APIMANS += gnutls_pem_base64_encode_alloc.3
APIMANS += gnutls_perror.3
APIMANS += gnutls_pk_algorithm_get_name.3
APIMANS += gnutls_pk_bits_to_sec_param.3
+APIMANS += gnutls_pk_get_id.3
+APIMANS += gnutls_pk_get_name.3
+APIMANS += gnutls_pk_list.3
+APIMANS += gnutls_pk_to_sign.3
APIMANS += gnutls_pkcs11_add_provider.3
APIMANS += gnutls_pkcs11_copy_secret_key.3
APIMANS += gnutls_pkcs11_copy_x509_crt.3
@@ -439,10 +444,6 @@ APIMANS += gnutls_pkcs7_set_crl.3
APIMANS += gnutls_pkcs7_set_crl_raw.3
APIMANS += gnutls_pkcs7_set_crt.3
APIMANS += gnutls_pkcs7_set_crt_raw.3
-APIMANS += gnutls_pk_get_id.3
-APIMANS += gnutls_pk_get_name.3
-APIMANS += gnutls_pk_list.3
-APIMANS += gnutls_pk_to_sign.3
APIMANS += gnutls_prf.3
APIMANS += gnutls_prf_raw.3
APIMANS += gnutls_priority_certificate_type_list.3
@@ -782,8 +783,8 @@ APIMANS += gnutls_x509_crt_set_proxy.3
APIMANS += gnutls_x509_crt_set_proxy_dn.3
APIMANS += gnutls_x509_crt_set_pubkey.3
APIMANS += gnutls_x509_crt_set_serial.3
-APIMANS += gnutls_x509_crt_set_subject_alternative_name.3
APIMANS += gnutls_x509_crt_set_subject_alt_name.3
+APIMANS += gnutls_x509_crt_set_subject_alternative_name.3
APIMANS += gnutls_x509_crt_set_subject_key_id.3
APIMANS += gnutls_x509_crt_set_version.3
APIMANS += gnutls_x509_crt_sign.3
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index abb7649..00187a5 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -619,6 +619,67 @@ uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE];
return 0;
}
+
+/**
+ * gnutls_privkey_import_openpgp_raw:
+ * @pkey: The private key
+ * @data: The private key data to be imported
+ * @format: The format of the private key
+ * @keyid: The key id to use (optional)
+ * @password: A password (optional)
+ *
+ * This function will import the given private key to the abstract
+ * #gnutls_privkey_t structure.
+ *
+ * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
+ * negative error value.
+ *
+ * Since: 3.1.0
+ **/
+int gnutls_privkey_import_openpgp_raw (gnutls_privkey_t pkey,
+ const gnutls_datum_t * data,
+ gnutls_openpgp_crt_fmt_t format,
+ const gnutls_openpgp_keyid_t keyid,
+ const char* password)
+{
+ gnutls_openpgp_privkey_t xpriv;
+ int ret;
+
+ ret = gnutls_openpgp_privkey_init(&xpriv);
+ if (ret < 0)
+ return gnutls_assert_val(ret);
+
+ ret = gnutls_openpgp_privkey_import(xpriv, data, format, password, 0);
+ if (ret < 0)
+ {
+ gnutls_assert();
+ goto cleanup;
+ }
+
+ if(keyid)
+ {
+ ret = gnutls_openpgp_privkey_set_preferred_key_id(xpriv, keyid);
+ if (ret < 0)
+ {
+ gnutls_assert();
+ goto cleanup;
+ }
+ }
+
+ ret = gnutls_privkey_import_openpgp(pkey, xpriv,
GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE);
+ if (ret < 0)
+ {
+ gnutls_assert();
+ goto cleanup;
+ }
+
+ ret = 0;
+
+cleanup:
+ gnutls_openpgp_privkey_deinit(xpriv);
+
+ return ret;
+}
#endif
/**
@@ -886,66 +947,6 @@ cleanup:
return ret;
}
-/**
- * gnutls_privkey_import_openpgp_raw:
- * @pkey: The private key
- * @data: The private key data to be imported
- * @format: The format of the private key
- * @keyid: The key id to use (optional)
- * @password: A password (optional)
- *
- * This function will import the given private key to the abstract
- * #gnutls_privkey_t structure.
- *
- * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
- * negative error value.
- *
- * Since: 3.1.0
- **/
-int gnutls_privkey_import_openpgp_raw (gnutls_privkey_t pkey,
- const gnutls_datum_t * data,
- gnutls_openpgp_crt_fmt_t format,
- const gnutls_openpgp_keyid_t keyid,
- const char* password)
-{
- gnutls_openpgp_privkey_t xpriv;
- int ret;
-
- ret = gnutls_openpgp_privkey_init(&xpriv);
- if (ret < 0)
- return gnutls_assert_val(ret);
-
- ret = gnutls_openpgp_privkey_import(xpriv, data, format, password, 0);
- if (ret < 0)
- {
- gnutls_assert();
- goto cleanup;
- }
-
- if(keyid)
- {
- ret = gnutls_openpgp_privkey_set_preferred_key_id(xpriv, keyid);
- if (ret < 0)
- {
- gnutls_assert();
- goto cleanup;
- }
- }
-
- ret = gnutls_privkey_import_openpgp(pkey, xpriv,
GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE);
- if (ret < 0)
- {
- gnutls_assert();
- goto cleanup;
- }
-
- ret = 0;
-
-cleanup:
- gnutls_openpgp_privkey_deinit(xpriv);
-
- return ret;
-}
/**
hooks/post-receive
--
GNU gnutls
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-117-g9952a5d,
Nikos Mavrogiannopoulos <=