307 |
int pv1[2], pv2[2]; |
int pv1[2], pv2[2]; |
308 |
fd_set wready, writeto; |
fd_set wready, writeto; |
309 |
int keytype, keylen; |
int keytype, keylen; |
310 |
|
int proto; |
311 |
|
|
312 |
#endif |
#endif |
313 |
|
|
314 |
signal(SIGINT, SIG_DFL); |
signal(SIGINT, SIG_DFL); |
568 |
int rc; |
int rc; |
569 |
char * err_msg = NULL; |
char * err_msg = NULL; |
570 |
|
|
571 |
rc = get_auth (STDIN_FILENO, &h, &enckey, &err_msg); |
rc = get_auth (STDIN_FILENO, &h, &enckey, &err_msg, &proto); |
572 |
if (rc != SHISHI_OK) |
if (rc != SHISHI_OK) |
573 |
{ |
{ |
574 |
error ("Kerberos authentication failure: %s\n", err_msg); |
error ("Kerberos authentication failure: %s\n", err_msg); |
852 |
else |
else |
853 |
#elif defined(SHISHI) |
#elif defined(SHISHI) |
854 |
if (doencrypt) |
if (doencrypt) |
855 |
readenc (h, s, &sig, &ret, &iv2, enckey); |
readenc (h, s, &sig, &ret, &iv2, enckey, proto); |
856 |
else |
else |
857 |
#endif |
#endif |
858 |
#endif |
#endif |
880 |
else |
else |
881 |
#elif defined(SHISHI) |
#elif defined(SHISHI) |
882 |
if (doencrypt) |
if (doencrypt) |
883 |
writeenc (h, s, buf, cc, &n, &iv4, enckey); |
writeenc (h, s, buf, cc, &n, &iv4, enckey, proto); |
884 |
else |
else |
885 |
#endif |
#endif |
886 |
#endif |
#endif |
900 |
} |
} |
901 |
else |
else |
902 |
#ifdef SHISHI |
#ifdef SHISHI |
903 |
writeenc (h, STDOUT_FILENO, buf, cc, &n, &iv3, enckey); |
writeenc (h, STDOUT_FILENO, buf, cc, &n, &iv3, enckey, proto); |
904 |
#else |
#else |
905 |
des_write (STDOUT_FILENO, buf, cc); |
des_write (STDOUT_FILENO, buf, cc); |
906 |
#endif |
#endif |
910 |
{ |
{ |
911 |
errno = 0; |
errno = 0; |
912 |
#ifdef SHISHI |
#ifdef SHISHI |
913 |
readenc (h, STDIN_FILENO, buf, &cc, &iv1, enckey); |
readenc (h, STDIN_FILENO, buf, &cc, &iv1, enckey, proto); |
914 |
#else |
#else |
915 |
cc = des_read (STDIN_FILENO, buf, sizeof buf); |
cc = des_read (STDIN_FILENO, buf, sizeof buf); |
916 |
#endif |
#endif |