Minor U2F improvements

privacyidea_pam.py

@@ -209,15 +209,15 @@ def u2f_challenge_response(self, transaction_id, message, attributes):
 %s
 ----- END U2F CHALLENGE -----""" % (self.URL,
                                     json.dumps(attributes["u2fSignRequest"]),
-                                    str(message or ""))
+                                    message)
 
         if bool(attributes.get("hideResponseInput", True)):
             prompt_type = self.pamh.PAM_PROMPT_ECHO_OFF
         else:
             prompt_type = self.pamh.PAM_PROMPT_ECHO_ON
 
-        message = self.pamh.Message(prompt_type, challenge)
-        response = self.pamh.conversation(message)
+        pam_message = self.pamh.Message(prompt_type, challenge)
+        response = self.pamh.conversation(pam_message)
         chal_response = json.loads(response.resp)
 
         data = {"user": self.user,

ssh-u2f.py

@@ -31,10 +31,13 @@
 
 Usage:
     Make executable
+    Configure otp_prompt variable to match your pam prompt
     Symlink ssh-u2f, scp-u2f, sftp-u2f, mosh-u2f, etc. into your PATH
     Call just like ssh, eg. "ssh-u2f name@example.com"
 """
 
+otp_prompt = "privacyIDEA_Authentication"
+
 ssh = None
 
 def handler(signum, frame):
@@ -75,7 +78,7 @@ def passthrough():
 
 while True:
     index = ssh.expect(["Authenticated with partial success.",
-                        "([Pp]assword[^:\r\n]*|Enter additional factors): ?",
+                        "([Pp]assword[^:\r\n]*|%s): ?" % otp_prompt,
                         "----- BEGIN U2F CHALLENGE -----\r\n",
                         "[^ \r\n]+",
                         pexpect.EOF])