replace tabs with spaces

Author: deadtrickster

bio.lisp

@@ -45,11 +45,11 @@
 (defun make-bio-lisp-method ()
   (let ((m (cffi:foreign-alloc '(:struct bio-method))))
     (setf (cffi:foreign-slot-value m '(:struct bio-method) 'type)
-	  ;; fixme: this is wrong, but presumably still better than some
-	  ;; random value here.
-	  +bio-type-socket+)
+    ;; fixme: this is wrong, but presumably still better than some
+    ;; random value here.
+    +bio-type-socket+)
     (macrolet ((slot (name)
-		 `(cffi:foreign-slot-value m '(:struct bio-method) ,name)))
+     `(cffi:foreign-slot-value m '(:struct bio-method) ,name)))
       (setf (slot 'name) (cffi:foreign-string-alloc "lisp"))
       (setf (slot 'bwrite) (cffi:callback lisp-write))
       (setf (slot 'bread) (cffi:callback lisp-read))
@@ -76,34 +76,34 @@
 
 (defun clear-retry-flags (bio)
   (setf (cffi:foreign-slot-value bio '(:struct bio) 'flags)
-	(logandc2 (cffi:foreign-slot-value bio '(:struct bio) 'flags)
-		  (logior +BIO_FLAGS_READ+
-			  +BIO_FLAGS_WRITE+
-			  +BIO_FLAGS_SHOULD_RETRY+))))
+  (logandc2 (cffi:foreign-slot-value bio '(:struct bio) 'flags)
+      (logior +BIO_FLAGS_READ+
+        +BIO_FLAGS_WRITE+
+        +BIO_FLAGS_SHOULD_RETRY+))))
 
 (defun set-retry-read (bio)
   (setf (cffi:foreign-slot-value bio '(:struct bio) 'flags)
-	(logior (cffi:foreign-slot-value bio '(:struct bio) 'flags)
-		+BIO_FLAGS_READ+
-		+BIO_FLAGS_SHOULD_RETRY+)))
+  (logior (cffi:foreign-slot-value bio '(:struct bio) 'flags)
+    +BIO_FLAGS_READ+
+    +BIO_FLAGS_SHOULD_RETRY+)))
 
 (cffi:defcallback lisp-read :int ((bio :pointer) (buf :pointer) (n :int))
   bio buf n
   (let ((i 0))
     (handler-case
-	(unless (or (cffi:null-pointer-p buf) (null n))
-	  (clear-retry-flags bio)
-	  (when (or *blockp* (listen *socket*))
+  (unless (or (cffi:null-pointer-p buf) (null n))
+    (clear-retry-flags bio)
+    (when (or *blockp* (listen *socket*))
             (setf (cffi:mem-ref buf :unsigned-char i) (read-byte *socket*))
             (incf i))
-	  (loop
-	      while (and (< i n)
+    (loop
+        while (and (< i n)
                          (or (null *partial-read-p*) (listen *socket*)))
-	      do
-		(setf (cffi:mem-ref buf :unsigned-char i) (read-byte *socket*))
-		(incf i))
-	  #+(or)
-	  (when (zerop i) (set-retry-read bio)))
+        do
+    (setf (cffi:mem-ref buf :unsigned-char i) (read-byte *socket*))
+    (incf i))
+    #+(or)
+    (when (zerop i) (set-retry-read bio)))
       (end-of-file ()))
     i))
 
@@ -135,4 +135,4 @@
       (setf (cffi:foreign-slot-value bio '(:struct bio) 'flags) 0)
       1)))
 
-(setf *bio-lisp-method* nil)		;force reinit if anything changed here
+(setf *bio-lisp-method* nil)    ;force reinit if anything changed here

conditions.lisp

@@ -68,15 +68,15 @@ by READ-SSL-ERROR-QUEUE) or an SSL-ERROR condition."
              (format stream "Unspecified error ~A on handle ~A" 
                      (ssl-error-ret condition)
                      (ssl-error-handle condition))
-	     (format-ssl-error-queue stream condition))))
+       (format-ssl-error-queue stream condition))))
 
 (define-condition ssl-error-initialize (ssl-error)
   ((reason  :initarg :reason
             :reader ssl-error-reason))
   (:report (lambda (condition stream)
              (format stream "SSL initialization error: ~A"
                      (ssl-error-reason condition))
-	     (format-ssl-error-queue stream condition))))
+       (format-ssl-error-queue stream condition))))
 
 
 (define-condition ssl-error-want-something (ssl-error/handle)
@@ -92,7 +92,7 @@ by READ-SSL-ERROR-QUEUE) or an SSL-ERROR condition."
              (format stream "The TLS/SSL operation on handle ~A completed (return code: ~A). "
                      (ssl-error-handle condition)
                      (ssl-error-ret condition))
-	     (format-ssl-error-queue stream condition))))
+       (format-ssl-error-queue stream condition))))
 
 ;; SSL_ERROR_ZERO_RETURN
 (define-condition ssl-error-zero-return (ssl-error/handle)
@@ -108,7 +108,7 @@ by READ-SSL-ERROR-QUEUE) or an SSL-ERROR condition."
              (format stream "The TLS/SSL connection on handle ~A has been closed (return code: ~A). "
                      (ssl-error-handle condition)
                      (ssl-error-ret condition))
-	     (format-ssl-error-queue stream condition))))
+       (format-ssl-error-queue stream condition))))
 
 ;; SSL_ERROR_WANT_READ
 (define-condition ssl-error-want-read (ssl-error-want-something)
@@ -127,7 +127,7 @@ by READ-SSL-ERROR-QUEUE) or an SSL-ERROR condition."
              (format stream "The TLS/SSL operation on handle ~A did not complete: It wants a READ (return code: ~A). "
                      (ssl-error-handle condition)
                      (ssl-error-ret condition))
-	     (format-ssl-error-queue stream condition))))
+       (format-ssl-error-queue stream condition))))
 
 ;; SSL_ERROR_WANT_WRITE
 (define-condition ssl-error-want-write (ssl-error-want-something)
@@ -146,7 +146,7 @@ by READ-SSL-ERROR-QUEUE) or an SSL-ERROR condition."
              (format stream "The TLS/SSL operation on handle ~A did not complete: It wants a WRITE (return code: ~A). "
                      (ssl-error-handle condition)
                      (ssl-error-ret condition))
-	     (format-ssl-error-queue stream condition))))
+       (format-ssl-error-queue stream condition))))
 
 ;; SSL_ERROR_WANT_CONNECT
 (define-condition ssl-error-want-connect (ssl-error-want-something)
@@ -165,7 +165,7 @@ by READ-SSL-ERROR-QUEUE) or an SSL-ERROR condition."
             (format stream "The TLS/SSL operation on handle ~A did not complete: It wants a connect first (return code: ~A). "
                      (ssl-error-handle condition)
                      (ssl-error-ret condition))
-	    (format-ssl-error-queue stream condition))))
+      (format-ssl-error-queue stream condition))))
 
 ;; SSL_ERROR_WANT_X509_LOOKUP
 (define-condition ssl-error-want-x509-lookup (ssl-error-want-something)
@@ -179,7 +179,7 @@ by READ-SSL-ERROR-QUEUE) or an SSL-ERROR condition."
              (format stream "The TLS/SSL operation on handle ~A did not complete: An application callback wants to be called again (return code: ~A). "
                      (ssl-error-handle condition)
                      (ssl-error-ret condition))
-	     (format-ssl-error-queue stream condition))))
+       (format-ssl-error-queue stream condition))))
 
 ;; SSL_ERROR_SYSCALL
 (define-condition ssl-error-syscall (ssl-error/handle)
@@ -202,7 +202,7 @@ by READ-SSL-ERROR-QUEUE) or an SSL-ERROR condition."
                                       (ssl-error-ret condition))))
                  (format stream "An UNKNOWN I/O error occurred in the underlying BIO (return code: ~A). "
                          (ssl-error-ret condition)))
-	     (format-ssl-error-queue stream condition))))
+       (format-ssl-error-queue stream condition))))
 
 ;; SSL_ERROR_SSL
 (define-condition ssl-error-ssl (ssl-error/handle)
@@ -212,33 +212,33 @@ by READ-SSL-ERROR-QUEUE) or an SSL-ERROR condition."
     OpenSSL error queue contains more information on the error.")
   (:report (lambda (condition stream)
              (format stream
-		     "A failure in the SSL library occurred on handle ~A (return code: ~A). "
+         "A failure in the SSL library occurred on handle ~A (return code: ~A). "
                      (ssl-error-handle condition)
                      (ssl-error-ret condition))
-	     (format-ssl-error-queue stream condition))))
+       (format-ssl-error-queue stream condition))))
 
 (defun ssl-signal-error (handle syscall error-code original-error)
   (let ((queue (read-ssl-error-queue)))
     (if (and (eql error-code #.+ssl-error-syscall+)
-	     (not (zerop original-error)))
-	(error 'ssl-error-syscall
-	       :handle handle
-	       :ret error-code
-	       :queue queue
-	       :syscall syscall)
+       (not (zerop original-error)))
+  (error 'ssl-error-syscall
+         :handle handle
+         :ret error-code
+         :queue queue
+         :syscall syscall)
       (error (case error-code
-	       (#.+ssl-error-none+ 'ssl-error-none)
-	       (#.+ssl-error-ssl+ 'ssl-error-ssl)
-	       (#.+ssl-error-want-read+ 'ssl-error-want-read)
-	       (#.+ssl-error-want-write+ 'ssl-error-want-write)
-	       (#.+ssl-error-want-x509-lookup+ 'ssl-error-want-x509-lookup)
-	       (#.+ssl-error-zero-return+ 'ssl-error-zero-return)
-	       (#.+ssl-error-want-connect+ 'ssl-error-want-connect)
-	       (#.+ssl-error-syscall+ 'ssl-error-zero-return) ; this is intentional here. we got an EOF from the syscall (ret is 0)
-	       (t 'ssl-error/handle))
-	     :handle handle
-	     :ret error-code
-	     :queue queue))))
+         (#.+ssl-error-none+ 'ssl-error-none)
+         (#.+ssl-error-ssl+ 'ssl-error-ssl)
+         (#.+ssl-error-want-read+ 'ssl-error-want-read)
+         (#.+ssl-error-want-write+ 'ssl-error-want-write)
+         (#.+ssl-error-want-x509-lookup+ 'ssl-error-want-x509-lookup)
+         (#.+ssl-error-zero-return+ 'ssl-error-zero-return)
+         (#.+ssl-error-want-connect+ 'ssl-error-want-connect)
+         (#.+ssl-error-syscall+ 'ssl-error-zero-return) ; this is intentional here. we got an EOF from the syscall (ret is 0)
+         (t 'ssl-error/handle))
+       :handle handle
+       :ret error-code
+       :queue queue))))
 
 (defparameter *ssl-verify-error-alist*
   '((0 :X509_V_OK)

example.lisp

@@ -21,18 +21,18 @@
   (let ((s (make-string-output-stream)))
     (loop
         for empty = t then nil
-	for c = (read-char stream eof-error-p nil)
-	while (and c (not (eql c #\return)))
-	do
-	  (unless (eql c #\newline)
-	    (write-char c s))
-	finally
-	  (return
-	    (if empty nil (get-output-stream-string s))))))
+  for c = (read-char stream eof-error-p nil)
+  while (and c (not (eql c #\return)))
+  do
+    (unless (eql c #\newline)
+      (write-char c s))
+  finally
+    (return
+      (if empty nil (get-output-stream-string s))))))
 
 (defun test-nntps-client (&optional (host "snews.gmane.org") (port 563))
   (let* ((fd (trivial-sockets:open-stream host port
-					  :element-type '(unsigned-byte 8)))
+            :element-type '(unsigned-byte 8)))
          (nntps (cl+ssl:make-ssl-client-stream fd :external-format '(:iso-8859-1 :eol-style :lf))))
     (format t "NNTPS> ~A~%" (read-line-crlf nntps))
     (write-line "HELP" nntps)
@@ -46,29 +46,29 @@
 ;; HEAD request
 (defun test-https-client (host &optional (port 443))
   (let* ((deadline (+ (get-internal-real-time)
-		      (* 3 internal-time-units-per-second)))
-	 (socket (ccl:make-socket :address-family :internet
-				  :connect :active
-				  :type :stream
-				  :remote-host host
-				  :remote-port port
-;;  				  :local-host (resolve-hostname local-host)
-;; 				  :local-port local-port
-				  :deadline deadline))
+          (* 3 internal-time-units-per-second)))
+   (socket (ccl:make-socket :address-family :internet
+          :connect :active
+          :type :stream
+          :remote-host host
+          :remote-port port
+;;            :local-host (resolve-hostname local-host)
+;;           :local-port local-port
+          :deadline deadline))
          (https
-	  (progn
-	    (cl+ssl:make-ssl-client-stream
-	     socket
-	     :unwrap-stream-p t
-	     :external-format '(:iso-8859-1 :eol-style :lf)))))
+    (progn
+      (cl+ssl:make-ssl-client-stream
+       socket
+       :unwrap-stream-p t
+       :external-format '(:iso-8859-1 :eol-style :lf)))))
     (unwind-protect
-	(progn
-	  (format https "GET / HTTP/1.0~%Host: ~a~%~%" host)
-	  (force-output https)
-	  (loop :for line = (read-line-crlf https nil)
-			    :while line :do
-			    (format t "HTTPS> ~a~%" line)))
-	  (close https))))
+  (progn
+    (format https "GET / HTTP/1.0~%Host: ~a~%~%" host)
+    (force-output https)
+    (loop :for line = (read-line-crlf https nil)
+          :while line :do
+          (format t "HTTPS> ~a~%" line)))
+    (close https))))
 
 ;; start a simple HTTPS server. See the mod_ssl documentation at
 ;; <URL:http://www.modssl.org/> for information on generating the
@@ -80,31 +80,31 @@
 ;;
 (defun test-https-server
     (&key (port 8080)
-	  (cert "/home/david/newcert.pem")
-	  (key "/home/david/newkey.pem"))
+    (cert "/home/david/newcert.pem")
+    (key "/home/david/newkey.pem"))
   (format t "~&SSL server listening on port ~d~%" port)
   (trivial-sockets:with-server (server (:port port))
     (loop
       (let* ((socket (trivial-sockets:accept-connection
-		      server
-		      :element-type '(unsigned-byte 8)))
-	     (client (cl+ssl:make-ssl-server-stream
-		      socket
-		      :external-format '(:iso-8859-1 :eol-style :lf)
-		      :certificate cert
-		      :key key)))
-	(unwind-protect
-	    (progn
-	      (loop :for line = (read-line-crlf client nil)
-				:while (> (length line) 1) :do
-				(format t "HTTPS> ~a~%" line))
-	      (format client "HTTP/1.0 200 OK~%")
-	      (format client "Server: SSL-CMUCL/1.1~%")
-	      (format client "Content-Type: text/plain~%")
-	      (terpri client)
-	      (format client "G'day at ~A!~%"
-		      (multiple-value-list (get-decoded-time)))
-	      (format client "CL+SSL running in ~A ~A~%"
-		      (lisp-implementation-type)
-		      (lisp-implementation-version)))
-	  (close client))))))
+          server
+          :element-type '(unsigned-byte 8)))
+       (client (cl+ssl:make-ssl-server-stream
+          socket
+          :external-format '(:iso-8859-1 :eol-style :lf)
+          :certificate cert
+          :key key)))
+  (unwind-protect
+      (progn
+        (loop :for line = (read-line-crlf client nil)
+        :while (> (length line) 1) :do
+        (format t "HTTPS> ~a~%" line))
+        (format client "HTTP/1.0 200 OK~%")
+        (format client "Server: SSL-CMUCL/1.1~%")
+        (format client "Content-Type: text/plain~%")
+        (terpri client)
+        (format client "G'day at ~A!~%"
+          (multiple-value-list (get-decoded-time)))
+        (format client "CL+SSL running in ~A ~A~%"
+          (lisp-implementation-type)
+          (lisp-implementation-version)))
+    (close client))))))