Merge branch 'guile-deprecate-openpgp' into 'master'

guile: Deprecate OpenPGP bindings.

See merge request gnutls/gnutls!1021

1 files changed, 13 insertions, 13 deletions

diff --git a/guile/src/core.c b/guile/src/core.c
index 0fb24e815e..7cb0c32bf1 100644
--- a/guile/src/core.c
+++ b/guile/src/core.c
@@ -2805,7 +2805,7 @@ SCM_DEFINE (scm_gnutls_x509_certificate_subject_alternative_name,
 #define GUILE_GNUTLS_MAX_OPENPGP_NAME_LENGTH  2048
 
 SCM_DEFINE (scm_gnutls_import_openpgp_certificate,
-            "import-openpgp-certificate", 2, 0, 0, (SCM data, SCM format),
+            "%import-openpgp-certificate", 2, 0, 0, (SCM data, SCM format),
             "Return a new OpenPGP certificate object resulting from the "
             "import of @var{data} (a uniform array) according to "
             "@var{format}.")
@@ -2849,7 +2849,7 @@ SCM_DEFINE (scm_gnutls_import_openpgp_certificate,
 #undef FUNC_NAME
 
 SCM_DEFINE (scm_gnutls_import_openpgp_private_key,
-            "import-openpgp-private-key", 2, 1, 0, (SCM data, SCM format,
+            "%import-openpgp-private-key", 2, 1, 0, (SCM data, SCM format,
                                                     SCM pass),
             "Return a new OpenPGP private key object resulting from the "
             "import of @var{data} (a uniform array) according to "
@@ -2904,7 +2904,7 @@ SCM_DEFINE (scm_gnutls_import_openpgp_private_key,
 
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_gnutls_openpgp_certificate_id, "openpgp-certificate-id",
+SCM_DEFINE (scm_gnutls_openpgp_certificate_id, "%openpgp-certificate-id",
             1, 0, 0,
             (SCM key),
             "Return the ID (an 8-element u8vector) of certificate "
@@ -2930,7 +2930,7 @@ SCM_DEFINE (scm_gnutls_openpgp_certificate_id, "openpgp-certificate-id",
 
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_gnutls_openpgp_certificate_id_x, "openpgp-certificate-id!",
+SCM_DEFINE (scm_gnutls_openpgp_certificate_id_x, "%openpgp-certificate-id!",
             2, 0, 0,
             (SCM key, SCM id),
             "Store the ID (an 8 byte sequence) of certificate "
@@ -2965,7 +2965,7 @@ SCM_DEFINE (scm_gnutls_openpgp_certificate_id_x, "openpgp-certificate-id!",
 #undef FUNC_NAME
 
 SCM_DEFINE (scm_gnutls_openpgp_certificate_fingerpint_x,
-            "openpgp-certificate-fingerprint!",
+            "%openpgp-certificate-fingerprint!",
             2, 0, 0,
             (SCM key, SCM fpr),
             "Store in @var{fpr} (a u8vector) the fingerprint of @var{key}.  "
@@ -2996,7 +2996,7 @@ SCM_DEFINE (scm_gnutls_openpgp_certificate_fingerpint_x,
 #undef FUNC_NAME
 
 SCM_DEFINE (scm_gnutls_openpgp_certificate_fingerprint,
-            "openpgp-certificate-fingerprint",
+            "%openpgp-certificate-fingerprint",
             1, 0, 0,
             (SCM key),
             "Return a new u8vector denoting the fingerprint of " "@var{key}.")
@@ -3054,7 +3054,7 @@ SCM_DEFINE (scm_gnutls_openpgp_certificate_fingerprint,
 
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_gnutls_openpgp_certificate_name, "openpgp-certificate-name",
+SCM_DEFINE (scm_gnutls_openpgp_certificate_name, "%openpgp-certificate-name",
             2, 0, 0,
             (SCM key, SCM index),
             "Return the @var{index}th name of @var{key}.")
@@ -3079,7 +3079,7 @@ SCM_DEFINE (scm_gnutls_openpgp_certificate_name, "openpgp-certificate-name",
 
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_gnutls_openpgp_certificate_names, "openpgp-certificate-names",
+SCM_DEFINE (scm_gnutls_openpgp_certificate_names, "%openpgp-certificate-names",
             1, 0, 0, (SCM key), "Return the list of names for @var{key}.")
 #define FUNC_NAME s_scm_gnutls_openpgp_certificate_names
 {
@@ -3112,7 +3112,7 @@ SCM_DEFINE (scm_gnutls_openpgp_certificate_names, "openpgp-certificate-names",
 #undef FUNC_NAME
 
 SCM_DEFINE (scm_gnutls_openpgp_certificate_algorithm,
-            "openpgp-certificate-algorithm",
+            "%openpgp-certificate-algorithm",
             1, 0, 0,
             (SCM key),
             "Return two values: the certificate algorithm used by "
@@ -3133,7 +3133,7 @@ SCM_DEFINE (scm_gnutls_openpgp_certificate_algorithm,
 #undef FUNC_NAME
 
 SCM_DEFINE (scm_gnutls_openpgp_certificate_version,
-            "openpgp-certificate-version",
+            "%openpgp-certificate-version",
             1, 0, 0,
             (SCM key),
             "Return the version of the OpenPGP message format (RFC2440) "
@@ -3151,7 +3151,7 @@ SCM_DEFINE (scm_gnutls_openpgp_certificate_version,
 
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_gnutls_openpgp_certificate_usage, "openpgp-certificate-usage",
+SCM_DEFINE (scm_gnutls_openpgp_certificate_usage, "%openpgp-certificate-usage",
             1, 0, 0,
             (SCM key),
             "Return a list of values denoting the key usage of @var{key}.")
@@ -3222,7 +3222,7 @@ SCM_DEFINE (scm_gnutls_import_openpgp_keyring, "import-openpgp-keyring",
 #undef FUNC_NAME
 
 SCM_DEFINE (scm_gnutls_openpgp_keyring_contains_key_id_p,
-            "openpgp-keyring-contains-key-id?",
+            "%openpgp-keyring-contains-key-id?",
             2, 0, 0,
             (SCM keyring, SCM id),
             "Return @code{#f} if key ID @var{id} is in @var{keyring}, "
@@ -3260,7 +3260,7 @@ SCM_DEFINE (scm_gnutls_openpgp_keyring_contains_key_id_p,
 /* OpenPGP certificates.  */
 
 SCM_DEFINE (scm_gnutls_set_certificate_credentials_openpgp_keys_x,
-            "set-certificate-credentials-openpgp-keys!",
+            "%set-certificate-credentials-openpgp-keys!",
             3, 0, 0,
             (SCM cred, SCM pub, SCM sec),
             "Use certificate @var{pub} and secret key @var{sec} in "