summaryrefslogtreecommitdiff
path: root/guile/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-12-04 22:15:16 +0100
committerLudovic Courtès <ludo@gnu.org>2014-12-04 22:17:14 +0100
commit0b88d762e6989afe5d1f7fa122b786f9c9215eb0 (patch)
tree1f04db50f0c248464dcad52b6288d1ef7d458b4b /guile/tests
parent85b42aa5aaf21e1c260009fc6e56b69360e62969 (diff)
downloadgnutls-0b88d762e6989afe5d1f7fa122b786f9c9215eb0.tar.gz
guile: Remove RSA parameters and related procedures.
* guile/modules/gnutls/build/smobs.scm (%rsa-parameters-smob): Remove. (%gnutls-smobs): Remove it. * guile/src/core.c (scm_gnutls_make_rsa_parameters, scm_gnutls_pkcs1_import_rsa_parameters, scm_gnutls_pkcs1_export_rsa_parameters, scm_gnutls_set_certificate_credentials_rsa_export_params_x): Remove. * guile/modules/gnutls.in: Adjust export list. * guile/tests/openpgp-auth.scm (import-rsa-params): Remove. Remove references to it and to 'set-certificate-credentials-rsa-export-parameters!'. * guile/tests/x509-auth.scm: Likewise. * doc/gnutls-guile.texi (Representation of Binary Data): Remove references to RSA parameters. Adjust example accordingly. (OpenPGP Authentication Guile Example): Likewise.
Diffstat (limited to 'guile/tests')
-rw-r--r--guile/tests/openpgp-auth.scm8
-rw-r--r--guile/tests/x509-auth.scm8
2 files changed, 2 insertions, 14 deletions
diff --git a/guile/tests/openpgp-auth.scm b/guile/tests/openpgp-auth.scm
index 286a0e3873..a60f8856ae 100644
--- a/guile/tests/openpgp-auth.scm
+++ b/guile/tests/openpgp-auth.scm
@@ -1,5 +1,5 @@
;;; GnuTLS-extra --- Guile bindings for GnuTLS-EXTRA.
-;;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
+;;; Copyright (C) 2007-2014 Free Software Foundation, Inc.
;;;
;;; GnuTLS-extra is free software; you can redistribute it and/or modify
;;; it under the terms of the GNU General Public License as published by
@@ -46,10 +46,6 @@
(define (import-key import-proc file)
(import-something import-proc file openpgp-certificate-format/base64))
-(define (import-rsa-params file)
- (import-something pkcs1-import-rsa-parameters file
- x509-certificate-format/pem))
-
(define (import-dh-params file)
(import-something pkcs3-import-dh-parameters file
x509-certificate-format/pem))
@@ -87,7 +83,6 @@
(primitive-exit))
(let ((server (make-session connection-end/server))
- (rsa (import-rsa-params "rsa-parameters.pem"))
(dh (import-dh-params "dh-parameters.pem")))
;; server-side
(set-session-priorities! server priorities)
@@ -97,7 +92,6 @@
(set-session-transport-fd! server (port->fdes (cdr socket-pair)))
(let ((cred (make-certificate-credentials)))
(set-certificate-credentials-dh-parameters! cred dh)
- (set-certificate-credentials-rsa-export-parameters! cred rsa)
(set-certificate-credentials-openpgp-keys! cred pub sec)
(set-session-credentials! server cred))
(set-session-dh-prime-bits! server 1024)
diff --git a/guile/tests/x509-auth.scm b/guile/tests/x509-auth.scm
index 1a00790bc6..cc83ed95a4 100644
--- a/guile/tests/x509-auth.scm
+++ b/guile/tests/x509-auth.scm
@@ -1,5 +1,5 @@
;;; GnuTLS --- Guile bindings for GnuTLS.
-;;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
+;;; Copyright (C) 2007-2014 Free Software Foundation, Inc.
;;;
;;; GnuTLS is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Lesser General Public
@@ -50,10 +50,6 @@
(define (import-key import-proc file)
(import-something import-proc file x509-certificate-format/pem))
-(define (import-rsa-params file)
- (import-something pkcs1-import-rsa-parameters file
- x509-certificate-format/pem))
-
(define (import-dh-params file)
(import-something pkcs3-import-dh-parameters file
x509-certificate-format/pem))
@@ -96,7 +92,6 @@
(primitive-exit))
(let ((server (make-session connection-end/server))
- (rsa (import-rsa-params "rsa-parameters.pem"))
(dh (import-dh-params "dh-parameters.pem")))
;; server-side
(set-session-default-priority! server)
@@ -114,7 +109,6 @@
"x509-certificate.pem"))
(trust-fmt x509-certificate-format/pem))
(set-certificate-credentials-dh-parameters! cred dh)
- (set-certificate-credentials-rsa-export-parameters! cred rsa)
(set-certificate-credentials-x509-keys! cred (list pub) sec)
(set-certificate-credentials-x509-trust-file! cred
trust-file