inetutils/libtelnet shishi.c

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    inetutils
Branch:         
Changes by:     Nicolas Pouvesle <address@hidden>       03/10/10 14:47:40

Modified files:
        libtelnet      : shishi.c 

Log message:
        Fix temporarily all encryption modes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/inetutils/libtelnet/shishi.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: inetutils/libtelnet/shishi.c
diff -u inetutils/libtelnet/shishi.c:1.2 inetutils/libtelnet/shishi.c:1.3
--- inetutils/libtelnet/shishi.c:1.2    Fri Sep 26 11:16:56 2003
+++ inetutils/libtelnet/shishi.c        Fri Oct 10 14:47:40 2003
@@ -133,6 +133,7 @@
   char type_check[2];
   Shishi_tkt *tkt;
   Shishi_tkts_hint hint;
+  Shishi_key *subkey;
   int rc;
   char *tmp;
   char *apreq;
@@ -170,8 +171,32 @@
 
   if (tkt)
     {
-      rc = shishi_ap_tktoptionsdata (shishi_handle, &auth_handle, tkt,
-                                    ap_opts, (char *) &type_check, 2);
+      rc = shishi_ap_nosubkey (shishi_handle, &auth_handle);
+      if (rc != SHISHI_OK)
+       {
+         DEBUG (("telnet: Kerberos V5: Could not make AP-REQ (%s)\r\n",
+                 shishi_strerror (rc)));
+         return 0;
+       }
+
+      rc = shishi_key_random (shishi_handle, SHISHI_DES_CBC_MD5, &subkey);
+      if (rc != SHISHI_OK)
+       return rc;
+
+      rc = shishi_authenticator_set_subkey (shishi_handle, 
shishi_ap_authenticator (auth_handle),
+                                           shishi_key_type (subkey),
+                                           shishi_key_value (subkey),
+                                           shishi_key_length (subkey));
+      if (rc != SHISHI_OK)
+       {
+         DEBUG (("telnet: Kerberos V5: Could not make AP-REQ (%s)\r\n",
+                 shishi_strerror (rc)));
+         return 0;
+       }
+
+      shishi_key_done (subkey);
+
+      rc = shishi_ap_set_tktoptionsdata (auth_handle, tkt, ap_opts, (char *) 
&type_check, 2);
       if (rc != SHISHI_OK)
        {
          DEBUG (("telnet: Kerberos V5: Could not make AP-REQ (%s)\r\n",