Anonymous avatar Anonymous committed c53cc68

Sync with Emacs 21 (Change copyright status to
reflect FSF assignment, remove starttls-open-ssl-stream, improve
customize of variables).

Comments (0)

Files changed (1)

-;;; starttls.el --- TLSv1 functions
+;;; starttls.el --- STARTTLS functions
 
-;; Copyright (C) 1999 Daiki Ueno
+;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
-;; Author: Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
-;; 	Kenichi OKADA <okada@opaopa.org>
+;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/20
-;; Keywords: TLS, SSL, OpenSSL
+;; Keywords: TLS, SSL, OpenSSL, mail, news
 
-;; This file is not part of any package.
+;; This file is part of XEmacs.
 
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
+;; XEmacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
 
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
+;; XEmacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; along with XEmacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
-;; This module defines some utility functions for TLSv1 functions.
-
-;; [RFC 2246] "The TLS Protocol Version 1.0"
-;;	by Christopher Allen <callen@certicom.com> and 
-;;	Tim Dierks <tdierks@certicom.com> (1999/01)
+;; This module defines some utility functions for STARTTLS profiles.
 
 ;; [RFC 2595] "Using TLS with IMAP, POP3 and ACAP"
 ;;	by Chris Newman <chris.newman@innosoft.com> (1999/06)
 
 (defgroup starttls nil
   "Support for `Transport Layer Security' protocol."
-  :group 'ssl)
+  :version "21.1"
+  :group 'mail)
 
 (defcustom starttls-program "starttls"
   "The program to run in a subprocess to open an TLSv1 connection."
+  :type 'string
   :group 'starttls)
 
 (defcustom starttls-extra-args nil
-  "Extra arguments to `starttls-program'"
+  "Extra arguments to `starttls-program'."
+  :type '(repeat string)
   :group 'starttls)
 
 (defun starttls-negotiate (process)
 Third arg is name of the host to connect to, or its IP address.
 Fourth arg SERVICE is name of the service desired, or an integer
 specifying a port number to connect to."
-
   (let* ((process-connection-type nil)
 	 (process (apply #'start-process
 			 name buffer starttls-program
     (process-kill-without-query process)
     process))
 
-(defun starttls-open-ssl-stream (name buffer host service)
-  "This function is compatible with the function `open-ssl-stream'."
-  (let* ((starttls-extra-args
-	  (cons "--force" starttls-extra-args)))
-    (starttls-open-stream name buffer host service)))
-
 (provide 'starttls)
 
 ;;; starttls.el ends here
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.