[cl-xmpp-cvs] CVS update: cl-xmpp/cl-xmpp-sasl.lisp cl-xmpp/cl-xmpp.lisp

[Erik Enge]

Update of /project/cl-xmpp/cvsroot/cl-xmpp
In directory common-lisp.net:/tmp/cvs-serv19607

Modified Files:
	cl-xmpp-sasl.lisp cl-xmpp.lisp 
Log Message:
making handle write to *debug-stream* and now using cl-sasl 0.2 so
passing it a byte-array, not a string of characters

Date: Sat Nov 12 03:37:29 2005
Author: eenge

Index: cl-xmpp/cl-xmpp-sasl.lisp
diff -u cl-xmpp/cl-xmpp-sasl.lisp:1.4 cl-xmpp/cl-xmpp-sasl.lisp:1.5
--- cl-xmpp/cl-xmpp-sasl.lisp:1.4	Sat Nov 12 03:29:51 2005
+++ cl-xmpp/cl-xmpp-sasl.lisp	Sat Nov 12 03:37:29 2005
@@ -1,4 +1,4 @@
-;;;; $Id: cl-xmpp-sasl.lisp,v 1.4 2005/11/12 02:29:51 eenge Exp $
+;;;; $Id: cl-xmpp-sasl.lisp,v 1.5 2005/11/12 02:37:29 eenge Exp $
 ;;;; $Source: /project/cl-xmpp/cvsroot/cl-xmpp/cl-xmpp-sasl.lisp,v $
 
 ;;;; See the LICENSE file for licensing information.
@@ -32,7 +32,7 @@
 					   :service "xmpp"
 					   :realm (hostname connection)
 					   :host (hostname connection)))
-	       (response (sasl:client-step sasl-client challenge-string))
+	       (response (sasl:client-step sasl-client (ironclad:ascii-string-to-byte-array challenge-string)))
 	       (base64-response (base64:string-to-base64-string response)))
 	  (format *debug-stream* "~&challenge-string: ~a~%" challenge-string)
 	  (format *debug-stream* "response: ~a~%" response)


Index: cl-xmpp/cl-xmpp.lisp
diff -u cl-xmpp/cl-xmpp.lisp:1.11 cl-xmpp/cl-xmpp.lisp:1.12
--- cl-xmpp/cl-xmpp.lisp:1.11	Sat Nov 12 03:29:51 2005
+++ cl-xmpp/cl-xmpp.lisp	Sat Nov 12 03:37:29 2005
@@ -1,4 +1,4 @@
-;;;; $Id: cl-xmpp.lisp,v 1.11 2005/11/12 02:29:51 eenge Exp $
+;;;; $Id: cl-xmpp.lisp,v 1.12 2005/11/12 02:37:29 eenge Exp $
 ;;;; $Source: /project/cl-xmpp/cvsroot/cl-xmpp/cl-xmpp.lisp,v $
 
 ;;;; See the LICENSE file for licensing information.
@@ -119,7 +119,7 @@
   (map 'list #'(lambda (x) (handle connection x)) list))
 
 (defmethod handle ((connection connection) object)
-  (format t "~&UNHANDLED: ~a~%" object)
+  (format *debug-stream* "~&UNHANDLED: ~a~%" object)
   object)
 
 ;;
@@ -389,7 +389,7 @@
    (cxml:with-element "username" (cxml:text username))))
 
 (defmethod auth ((connection connection) username password
-		 resource &key (mechanism :plain))
+		 resource &optional (mechanism :plain))
   (setf (username connection) username)
   (funcall (get-auth-method mechanism) connection username password resource))