Index: openacs-4/packages/xooauth/xooauth.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xooauth/xooauth.info,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/xooauth/xooauth.info	7 Nov 2020 17:58:24 -0000	1.1.2.1
+++ openacs-4/packages/xooauth/xooauth.info	18 Apr 2021 18:10:42 -0000	1.1.2.2
@@ -10,7 +10,7 @@
     <inherit-templates-p>f</inherit-templates-p>
     <auto-mount>oauth</auto-mount>
 
-    <version name="0.2d" url="http://openacs.org/repository/download/apm/xooauth-0.2d.apm">
+    <version name="0.3d" url="http://openacs.org/repository/download/apm/xooauth-0.3d.apm">
         <owner url="mailto:michael.aram@km.co.at">Michael Aram</owner>
         <summary>XOTcl based OAuth implementation for OpenACS</summary>
         <vendor url="https://km.co.at">KM</vendor>
@@ -28,7 +28,7 @@
         </description>
         <maturity>0</maturity>
 
-        <provides url="xooauth" version="0.2d"/>
+        <provides url="xooauth" version="0.3d"/>
         <requires url="xotcl-core" version="5.10.0d1"/>
 
         <callbacks>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xooauth/tcl/lti-includelet-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xooauth/tcl/lti-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/xooauth/tcl/oauth-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xooauth/tcl/oauth-procs.tcl,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/xooauth/tcl/oauth-procs.tcl	12 Mar 2021 10:23:58 -0000	1.1.2.4
+++ openacs-4/packages/xooauth/tcl/oauth-procs.tcl	18 Apr 2021 18:10:42 -0000	1.1.2.5
@@ -245,6 +245,7 @@
     # I hope I have no error in reasoning here...
     # set sorted_parameter_pair_list [lsort -index 0 $encoded_parameter_pair_list]
     set sorted_concatenated_parameter_list [lsort $concatenated_parameter_list]
+    
     #:log "Sorted Concatenated Parameters"
     #foreach pair $sorted_concatenated_parameter_list {
     #  foreach {key value} $pair {
@@ -259,29 +260,15 @@
 
   Signature instproc generate {} {
 
-    set signature_base_string [:construct_base_string]
+    set signature [ns_crypto::hmac string \
+                       -binary \
+                       -digest sha1 \
+                       -encoding base64 \
+                       [:encode ${:client_secret}]&[:encode ${:token_secret}] \
+                       [:construct_base_string] \
+                      ]
 
-    append hmac_sha1_key [:encode ${:client_secret}]
-    append hmac_sha1_key &
-    append hmac_sha1_key [:encode ${:token_secret}]
-
-    #package require sha1
-    #set hmac_sha1_digest [sha1::hmac -bin -key $hmac_sha1_key $signature_base_string]
-    #set oauth_signature_parameter [base64::encode $hmac_sha1_digest]
-
-    set oauth_signature_parameter [ns_crypto::hmac string \
-                                       -binary \
-                                       -digest sha1 \
-                                       -encoding base64 \
-                                       $hmac_sha1_key $signature_base_string]
-
-    # FIXME - TODO: It seems, as if the LTI tool provider under
-    # http://www.imsglobal.org/developers/BLTI/tool.php does not accept a URL-encoded
-    # encoding of the SBS. However, - if I remember correctly - Twitter wants
-    # us to encode that here... Needs further checking...
-    #set oauth_signature_parameter [:encode $oauth_signature_parameter]
-
-    return $oauth_signature_parameter
+    return $signature
   }
 
   Signature ad_instproc encode {s} {