oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

drop krbv4 support

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24508 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-01-26 01:12:06 +00:00
parent 75033a80fd
commit 4cdb695b3f
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
appl/rsh/common.c
View File

@@ -34,7 +34,7 @@
#include "rsh_locl.h" #include "rsh_locl.h"
RCSID("$Id$"); RCSID("$Id$");
#if defined(KRB4) || defined(KRB5) #if defined(KRB5)
#ifdef KRB5 #ifdef KRB5
int key_usage = 1026; int key_usage = 1026;
@@ -74,11 +74,6 @@ ssize_t
do_read (int fd, void *buf, size_t sz, void *ivec) do_read (int fd, void *buf, size_t sz, void *ivec)
{ {
if (do_encrypt) { if (do_encrypt) {
#ifdef KRB4
if (auth_method == AUTH_KRB4) {
return des_enc_read (fd, buf, sz, schedule, &iv);
} else
#endif /* KRB4 */
#ifdef KRB5 #ifdef KRB5
if(auth_method == AUTH_KRB5) { if(auth_method == AUTH_KRB5) {
krb5_error_code ret; krb5_error_code ret;
@@ -134,11 +129,6 @@ ssize_t
do_write (int fd, void *buf, size_t sz, void *ivec) do_write (int fd, void *buf, size_t sz, void *ivec)
{ {
if (do_encrypt) { if (do_encrypt) {
#ifdef KRB4
if(auth_method == AUTH_KRB4) {
return des_enc_write (fd, buf, sz, schedule, &iv);
} else
#endif /* KRB4 */
#ifdef KRB5 #ifdef KRB5
if(auth_method == AUTH_KRB5) { if(auth_method == AUTH_KRB5) {
krb5_error_code status; krb5_error_code status;
@@ -177,4 +167,4 @@ do_write (int fd, void *buf, size_t sz, void *ivec)
} else } else
return write (fd, buf, sz); return write (fd, buf, sz);
} }
#endif /* KRB4 || KRB5 */ #endif /* KRB5 */