remove dead code

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9960 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-05-16 22:08:08 +00:00
parent f51634d05e
commit 27e41d0454

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998 - 1999 Kungliga Tekniska H<>gskolan
* Copyright (c) 1998 - 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -35,35 +35,6 @@
RCSID("$Id$");
/* these functions does what the normal asn.1-functions does, but
converts the keytype to/from the on-the-wire enctypes */
#if 1
#define DECODE(T, K) return decode_ ## T(data, length, t, len)
#define ENCODE(T, K) return encode_ ## T(data, length, t, len)
#else
#define DECODE(T, K) \
{ \
krb5_error_code ret; \
ret = decode_ ## T((void*)data, length, t, len); \
if(ret) \
return ret; \
if(K) \
ret = krb5_decode_keyblock(context, (K), 1); \
return ret; \
}
#define ENCODE(T, K) \
{ \
krb5_error_code ret = 0; \
if(K) \
ret = krb5_decode_keyblock(context, (K), 0); \
if(ret) \
return ret; \
return encode_ ## T(data, length, t, len); \
}
#endif
krb5_error_code
krb5_decode_EncTicketPart (krb5_context context,
const void *data,
@@ -71,7 +42,7 @@ krb5_decode_EncTicketPart (krb5_context context,
EncTicketPart *t,
size_t *len)
{
DECODE(EncTicketPart, &t->key);
return decode_EncTicketPart(data, length, t, len);
}
krb5_error_code
@@ -81,7 +52,7 @@ krb5_encode_EncTicketPart (krb5_context context,
EncTicketPart *t,
size_t *len)
{
ENCODE(EncTicketPart, &t->key);
return encode_EncTicketPart(data, length, t, len);
}
krb5_error_code
@@ -91,7 +62,7 @@ krb5_decode_EncASRepPart (krb5_context context,
EncASRepPart *t,
size_t *len)
{
DECODE(EncASRepPart, &t->key);
return decode_EncASRepPart(data, length, t, len);
}
krb5_error_code
@@ -101,7 +72,7 @@ krb5_encode_EncASRepPart (krb5_context context,
EncASRepPart *t,
size_t *len)
{
ENCODE(EncASRepPart, &t->key);
return encode_EncASRepPart(data, length, t, len);
}
krb5_error_code
@@ -111,7 +82,7 @@ krb5_decode_EncTGSRepPart (krb5_context context,
EncTGSRepPart *t,
size_t *len)
{
DECODE(EncTGSRepPart, &t->key);
return decode_EncTGSRepPart(data, length, t, len);
}
krb5_error_code
@@ -121,7 +92,7 @@ krb5_encode_EncTGSRepPart (krb5_context context,
EncTGSRepPart *t,
size_t *len)
{
ENCODE(EncTGSRepPart, &t->key);
return encode_EncTGSRepPart(data, length, t, len);
}
krb5_error_code
@@ -131,7 +102,7 @@ krb5_decode_EncAPRepPart (krb5_context context,
EncAPRepPart *t,
size_t *len)
{
DECODE(EncAPRepPart, t->subkey);
return decode_EncAPRepPart(data, length, t, len);
}
krb5_error_code
@@ -141,7 +112,7 @@ krb5_encode_EncAPRepPart (krb5_context context,
EncAPRepPart *t,
size_t *len)
{
ENCODE(EncAPRepPart, t->subkey);
return encode_EncAPRepPart(data, length, t, len);
}
krb5_error_code
@@ -151,7 +122,7 @@ krb5_decode_Authenticator (krb5_context context,
Authenticator *t,
size_t *len)
{
DECODE(Authenticator, t->subkey);
return decode_Authenticator(data, length, t, len);
}
krb5_error_code
@@ -161,7 +132,7 @@ krb5_encode_Authenticator (krb5_context context,
Authenticator *t,
size_t *len)
{
ENCODE(Authenticator, t->subkey);
return encode_Authenticator(data, length, t, len);
}
krb5_error_code
@@ -171,19 +142,7 @@ krb5_decode_EncKrbCredPart (krb5_context context,
EncKrbCredPart *t,
size_t *len)
{
#if 1
return decode_EncKrbCredPart(data, length, t, len);
#else
krb5_error_code ret;
int i;
ret = decode_EncKrbCredPart((void*)data, length, t, len);
if(ret)
return ret;
for(i = 0; i < t->ticket_info.len; i++)
if((ret = krb5_decode_keyblock(context, &t->ticket_info.val[i].key, 1)))
break;
return ret;
#endif
}
krb5_error_code
@@ -193,15 +152,6 @@ krb5_encode_EncKrbCredPart (krb5_context context,
EncKrbCredPart *t,
size_t *len)
{
#if 0
krb5_error_code ret = 0;
int i;
for(i = 0; i < t->ticket_info.len; i++)
if((ret = krb5_decode_keyblock(context, &t->ticket_info.val[i].key, 0)))
break;
if(ret) return ret;
#endif
return encode_EncKrbCredPart (data, length, t, len);
}
@@ -212,21 +162,7 @@ krb5_decode_ETYPE_INFO (krb5_context context,
ETYPE_INFO *t,
size_t *len)
{
#if 1
return decode_ETYPE_INFO(data, length, t, len);
#else
krb5_error_code ret;
int i;
ret = decode_ETYPE_INFO((void*)data, length, t, len);
if(ret)
return ret;
for(i = 0; i < t->len; i++) {
if((ret = krb5_decode_keytype(context, &t->val[i].etype, 1)))
break;
}
return ret;
#endif
}
krb5_error_code
@@ -236,16 +172,5 @@ krb5_encode_ETYPE_INFO (krb5_context context,
ETYPE_INFO *t,
size_t *len)
{
#if 0
krb5_error_code ret = 0;
int i;
/* XXX this will break, since we need one key-info for each enctype */
/* XXX or do we? */
for(i = 0; i < t->len; i++)
if((ret = krb5_decode_keytype(context, &t->val[i].etype, 0)))
break;
if(ret) return ret;
#endif
return encode_ETYPE_INFO (data, length, t, len);
}