fix for heimdal 0.7.2

1 files changed, 22 insertions, 17 deletions

diff --git a/lib/libkrb5/generated/asn1_EncKrbPrivPart.c b/lib/libkrb5/generated/asn1_EncKrbPrivPart.c
index d5d4e42dc5b..9cdab22cb44 100644
--- a/lib/libkrb5/generated/asn1_EncKrbPrivPart.c
+++ b/lib/libkrb5/generated/asn1_EncKrbPrivPart.c
@@ -1,4 +1,4 @@
-/* Generated from /usr/src/lib/libkrb5/../../kerberosV/src/lib/asn1/k5.asn1 */
+/* Generated from /home/biorn/src/lib/libkrb5/../../kerberosV/src/lib/asn1/k5.asn1 */
 /* Do not edit */
 
 #include <stdio.h>
@@ -27,7 +27,7 @@ int oldret = ret;
 ret = 0;
 e = encode_HostAddress(p, len, (data)->r_address, &l);
 BACK;
-e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, 5, &l);
+e = der_put_length_and_tag (p, len, ret, ASN1_C_CONTEXT, CONS, 5, &l);
 BACK;
 ret += oldret;
 }
@@ -37,7 +37,7 @@ int oldret = ret;
 ret = 0;
 e = encode_HostAddress(p, len, (data)->s_address, &l);
 BACK;
-e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, 4, &l);
+e = der_put_length_and_tag (p, len, ret, ASN1_C_CONTEXT, CONS, 4, &l);
 BACK;
 ret += oldret;
 }
@@ -47,7 +47,7 @@ int oldret = ret;
 ret = 0;
 e = encode_UNSIGNED(p, len, (data)->seq_number, &l);
 BACK;
-e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, 3, &l);
+e = der_put_length_and_tag (p, len, ret, ASN1_C_CONTEXT, CONS, 3, &l);
 BACK;
 ret += oldret;
 }
@@ -57,7 +57,7 @@ int oldret = ret;
 ret = 0;
 e = encode_integer(p, len, (data)->usec, &l);
 BACK;
-e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, 2, &l);
+e = der_put_length_and_tag (p, len, ret, ASN1_C_CONTEXT, CONS, 2, &l);
 BACK;
 ret += oldret;
 }
@@ -67,7 +67,7 @@ int oldret = ret;
 ret = 0;
 e = encode_KerberosTime(p, len, (data)->timestamp, &l);
 BACK;
-e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, 1, &l);
+e = der_put_length_and_tag (p, len, ret, ASN1_C_CONTEXT, CONS, 1, &l);
 BACK;
 ret += oldret;
 }
@@ -76,13 +76,13 @@ int oldret = ret;
 ret = 0;
 e = encode_octet_string(p, len, &(data)->user_data, &l);
 BACK;
-e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, 0, &l);
+e = der_put_length_and_tag (p, len, ret, ASN1_C_CONTEXT, CONS, 0, &l);
 BACK;
 ret += oldret;
 }
-e = der_put_length_and_tag (p, len, ret, UNIV, CONS, UT_Sequence, &l);
+e = der_put_length_and_tag (p, len, ret, ASN1_C_UNIV, CONS, UT_Sequence, &l);
 BACK;
-e = der_put_length_and_tag (p, len, ret, APPL, CONS, 28, &l);
+e = der_put_length_and_tag (p, len, ret, ASN1_C_APPL, CONS, 28, &l);
 BACK;
 *size = ret;
 return 0;
@@ -99,13 +99,13 @@ int e;
 
 memset(data, 0, sizeof(*data));
 reallen = 0;
-e = der_match_tag_and_length (p, len, APPL, CONS, 28, &reallen, &l);
+e = der_match_tag_and_length (p, len, ASN1_C_APPL, CONS, 28, &reallen, &l);
 FORW;
 {
 int dce_fix;
 if((dce_fix = fix_dce(reallen, &len)) < 0)
 return ASN1_BAD_FORMAT;
-e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,&reallen, &l);
+e = der_match_tag_and_length (p, len, ASN1_C_UNIV, CONS, UT_Sequence,&reallen, &l);
 FORW;
 {
 int dce_fix;
@@ -114,7 +114,7 @@ return ASN1_BAD_FORMAT;
 {
 size_t newlen, oldlen;
 
-e = der_match_tag (p, len, CONTEXT, CONS, 0, &l);
+e = der_match_tag (p, len, ASN1_C_CONTEXT, CONS, 0, &l);
 if (e)
 return e;
 else {
@@ -140,7 +140,7 @@ len = oldlen - newlen;
 {
 size_t newlen, oldlen;
 
-e = der_match_tag (p, len, CONTEXT, CONS, 1, &l);
+e = der_match_tag (p, len, ASN1_C_CONTEXT, CONS, 1, &l);
 if (e)
 (data)->timestamp = NULL;
 else {
@@ -168,7 +168,7 @@ len = oldlen - newlen;
 {
 size_t newlen, oldlen;
 
-e = der_match_tag (p, len, CONTEXT, CONS, 2, &l);
+e = der_match_tag (p, len, ASN1_C_CONTEXT, CONS, 2, &l);
 if (e)
 (data)->usec = NULL;
 else {
@@ -196,7 +196,7 @@ len = oldlen - newlen;
 {
 size_t newlen, oldlen;
 
-e = der_match_tag (p, len, CONTEXT, CONS, 3, &l);
+e = der_match_tag (p, len, ASN1_C_CONTEXT, CONS, 3, &l);
 if (e)
 (data)->seq_number = NULL;
 else {
@@ -224,7 +224,7 @@ len = oldlen - newlen;
 {
 size_t newlen, oldlen;
 
-e = der_match_tag (p, len, CONTEXT, CONS, 4, &l);
+e = der_match_tag (p, len, ASN1_C_CONTEXT, CONS, 4, &l);
 if (e)
 (data)->s_address = NULL;
 else {
@@ -252,7 +252,7 @@ len = oldlen - newlen;
 {
 size_t newlen, oldlen;
 
-e = der_match_tag (p, len, CONTEXT, CONS, 5, &l);
+e = der_match_tag (p, len, ASN1_C_CONTEXT, CONS, 5, &l);
 if (e)
 (data)->r_address = NULL;
 else {
@@ -301,21 +301,26 @@ free_octet_string(&(data)->user_data);
 if((data)->timestamp) {
 free_KerberosTime((data)->timestamp);
 free((data)->timestamp);
+(data)->timestamp = NULL;
 }
 if((data)->usec) {
 free((data)->usec);
+(data)->usec = NULL;
 }
 if((data)->seq_number) {
 free_UNSIGNED((data)->seq_number);
 free((data)->seq_number);
+(data)->seq_number = NULL;
 }
 if((data)->s_address) {
 free_HostAddress((data)->s_address);
 free((data)->s_address);
+(data)->s_address = NULL;
 }
 if((data)->r_address) {
 free_HostAddress((data)->r_address);
 free((data)->r_address);
+(data)->r_address = NULL;
 }
 }