Substitute `certificate' to `public-key' in `(gnutls extra)'.

* guile/modules/gnutls/build/enums.scm (%openpgp-key-format-enum):
  Rename to...
  (%openpgp-certificate-format-enum): This.
  (%gnutls-extra-enums): Update.

* guile/modules/gnutls/build/smobs.scm (%openpgp-public-key-smob):
  Rename to...
  (%openpgp-certificate-smob): This.
  (%gnutls-extra-smobs): Update.

* guile/modules/gnutls/extra.scm: Substitute all `certificate' in all
  `public-key' names.  Add backward-compatible bindings.

* guile/src/extra.c: Substitute `certificate' to `public-key'.

3 files changed, 40 insertions, 18 deletions

diff --git a/guile/modules/gnutls/build/enums.scm b/guile/modules/gnutls/build/enums.scm
index b96b6dd8e2..ea60b579cd 100644
--- a/guile/modules/gnutls/build/enums.scm
+++ b/guile/modules/gnutls/build/enums.scm
@@ -565,8 +565,8 @@ unimplemented-feature)
                   "GNUTLS_E_"))
 
 
-(define %openpgp-key-format-enum
-  (make-enum-type 'openpgp-key-format "gnutls_openpgp_crt_fmt_t"
+(define %openpgp-certificate-format-enum
+  (make-enum-type 'openpgp-certificate-format "gnutls_openpgp_crt_fmt_t"
                   '(raw base64)
                   #f
                   "GNUTLS_OPENPGP_FMT_"))
@@ -586,7 +586,7 @@ unimplemented-feature)
 
 (define %gnutls-extra-enums
   ;; All enums for GnuTLS-extra (GPL).
-  (list %openpgp-key-format-enum))
+  (list %openpgp-certificate-format-enum))
 
 ;;; Local Variables:
 ;;; mode: scheme
diff --git a/guile/modules/gnutls/build/smobs.scm b/guile/modules/gnutls/build/smobs.scm
index d2dba3e3a2..ebac7eeea2 100644
--- a/guile/modules/gnutls/build/smobs.scm
+++ b/guile/modules/gnutls/build/smobs.scm
@@ -201,8 +201,8 @@
   (make-smob-type "gnutls_x509_privkey_t" 'x509-private-key
                   "gnutls_x509_privkey_deinit"))
 
-(define %openpgp-public-key-smob
-  (make-smob-type "gnutls_openpgp_crt_t" 'openpgp-public-key
+(define %openpgp-certificate-smob
+  (make-smob-type "gnutls_openpgp_crt_t" 'openpgp-certificate
                   "gnutls_openpgp_crt_deinit"))
 
 (define %openpgp-private-key-smob
@@ -226,7 +226,7 @@
 
 (define %gnutls-extra-smobs
   ;; All SMOB types for GnuTLS-extra (GPL).
-  (list %openpgp-public-key-smob %openpgp-private-key-smob
+  (list %openpgp-certificate-smob %openpgp-private-key-smob
         %openpgp-keyring-smob))
 
 
diff --git a/guile/modules/gnutls/extra.scm b/guile/modules/gnutls/extra.scm
index 989c524aa9..c9f34d06e9 100644
--- a/guile/modules/gnutls/extra.scm
+++ b/guile/modules/gnutls/extra.scm
@@ -16,7 +16,7 @@
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 ;;; USA.
 
-;;; Written by Ludovic Courtès <ludo@chbouib.org>
+;;; Written by Ludovic Courtès <ludo@gnu.org>
 
 (define-module (gnutls extra)
 
@@ -26,13 +26,13 @@
   :use-module (gnutls)
 
   :export (;; OpenPGP keys
-           openpgp-public-key? openpgp-private-key?
-           import-openpgp-public-key import-openpgp-private-key
-           openpgp-public-key-id openpgp-public-key-id!
-           openpgp-public-key-fingerprint openpgp-public-key-fingerprint!
-           openpgp-public-key-name openpgp-public-key-names
-           openpgp-public-key-algorithm openpgp-public-key-version
-           openpgp-public-key-usage
+           openpgp-certificate? openpgp-private-key?
+           import-openpgp-certificate import-openpgp-private-key
+           openpgp-certificate-id openpgp-certificate-id!
+           openpgp-certificate-fingerprint openpgp-certificate-fingerprint!
+           openpgp-certificate-name openpgp-certificate-names
+           openpgp-certificate-algorithm openpgp-certificate-version
+           openpgp-certificate-usage
 
            ;; OpenPGP keyrings
            openpgp-keyring? import-openpgp-keyring
@@ -42,18 +42,40 @@
            set-certificate-credentials-openpgp-keys!
 
            ;; enum->string functions
-           openpgp-key-format->string
+           openpgp-certificate-format->string
 
            ;; enum values
-           openpgp-key-format/raw
-           openpgp-key-format/base64))
+           openpgp-certificate-format/raw
+           openpgp-certificate-format/base64))
 
 
 (load-extension "libguile-gnutls-extra-v-0" "scm_init_gnutls_extra")
 
+
+;;;
+;;; Aliases kept for backward compatibility with GnuTLS 2.0.x.  These aliases
+;;; are deprecated in 2.2 and should be removed in 2.4.x.
+;;;
+
+(define-public openpgp-public-key? openpgp-certificate?)
+(define-public import-openpgp-public-key import-openpgp-certificate)
+(define-public openpgp-public-key-id openpgp-certificate-id)
+(define-public openpgp-public-key-id! openpgp-certificate-id!)
+(define-public openpgp-public-key-fingerprint openpgp-certificate-fingerprint)
+(define-public openpgp-public-key-fingerprint! openpgp-certificate-fingerprint!)
+(define-public openpgp-public-key-name openpgp-certificate-name)
+(define-public openpgp-public-key-names openpgp-certificate-names)
+(define-public openpgp-public-key-algorithm openpgp-certificate-algorithm)
+(define-public openpgp-public-key-version openpgp-certificate-version)
+(define-public openpgp-public-key-usage openpgp-certificate-usage)
+
+(define-public openpgp-key-format->string openpgp-certificate-format->string)
+(define-public openpgp-key-format/raw openpgp-certificate-format/raw)
+(define-public openpgp-key-format/base64 openpgp-certificate-format/base64)
+
+
 ;;; Local Variables:
 ;;; mode: scheme
 ;;; coding: latin-1
 ;;; End:
 
-;;; arch-tag: 2eb7693e-a221-41d3-8a14-a57426e9e670