Deleted Added
sdiff udiff text old ( 90926 ) new ( 103423 )
full compact
mk_safe.c (90926) mk_safe.c (103423)
1/*
1/*
2 * Copyright (c) 1997 - 2001 Kungliga Tekniska H�gskolan
2 * Copyright (c) 1997 - 2002 Kungliga Tekniska H�gskolan
3 * (Royal Institute of Technology, Stockholm, Sweden).
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 *
10 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#include <krb5_locl.h>
35
3 * (Royal Institute of Technology, Stockholm, Sweden).
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 *
10 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#include <krb5_locl.h>
35
36RCSID("$Id: mk_safe.c,v 1.27 2001/06/18 02:45:15 assar Exp $");
36RCSID("$Id: mk_safe.c,v 1.28 2002/09/04 16:26:05 joda Exp $");
37
38krb5_error_code
39krb5_mk_safe(krb5_context context,
40 krb5_auth_context auth_context,
41 const krb5_data *userdata,
42 krb5_data *outbuf,
43 /*krb5_replay_data*/ void *outdata)
44{
45 krb5_error_code ret;
46 KRB_SAFE s;
47 int32_t sec, usec;
48 KerberosTime sec2;
49 int usec2;
50 u_char *buf = NULL;
37
38krb5_error_code
39krb5_mk_safe(krb5_context context,
40 krb5_auth_context auth_context,
41 const krb5_data *userdata,
42 krb5_data *outbuf,
43 /*krb5_replay_data*/ void *outdata)
44{
45 krb5_error_code ret;
46 KRB_SAFE s;
47 int32_t sec, usec;
48 KerberosTime sec2;
49 int usec2;
50 u_char *buf = NULL;
51 void *tmp;
52 size_t buf_size;
53 size_t len;
54 u_int32_t tmp_seq;
55 krb5_crypto crypto;
56 krb5_keyblock *key;
57
58 if (auth_context->local_subkey)
59 key = auth_context->local_subkey;

--- 20 unchanged lines hidden (view full) ---

80
81 s.safe_body.s_address = auth_context->local_address;
82 s.safe_body.r_address = auth_context->remote_address;
83
84 s.cksum.cksumtype = 0;
85 s.cksum.checksum.data = NULL;
86 s.cksum.checksum.length = 0;
87
51 size_t buf_size;
52 size_t len;
53 u_int32_t tmp_seq;
54 krb5_crypto crypto;
55 krb5_keyblock *key;
56
57 if (auth_context->local_subkey)
58 key = auth_context->local_subkey;

--- 20 unchanged lines hidden (view full) ---

79
80 s.safe_body.s_address = auth_context->local_address;
81 s.safe_body.r_address = auth_context->remote_address;
82
83 s.cksum.cksumtype = 0;
84 s.cksum.checksum.data = NULL;
85 s.cksum.checksum.length = 0;
86
88 buf_size = length_KRB_SAFE(&s);
89 buf = malloc(buf_size + 128); /* add some for checksum */
90 if(buf == NULL) {
91 krb5_set_error_string (context, "malloc: out of memory");
92 return ENOMEM;
93 }
94 ret = encode_KRB_SAFE (buf + buf_size - 1, buf_size, &s, &len);
95 if (ret) {
96 free (buf);
87 ASN1_MALLOC_ENCODE(KRB_SAFE, buf, buf_size, &s, &len, ret);
88 if (ret)
97 return ret;
89 return ret;
98 }
90 if(buf_size != len)
91 krb5_abortx(context, "internal error in ASN.1 encoder");
99 ret = krb5_crypto_init(context, key, 0, &crypto);
100 if (ret) {
101 free (buf);
102 return ret;
103 }
104 ret = krb5_create_checksum(context,
105 crypto,
106 KRB5_KU_KRB_SAFE_CKSUM,
107 0,
92 ret = krb5_crypto_init(context, key, 0, &crypto);
93 if (ret) {
94 free (buf);
95 return ret;
96 }
97 ret = krb5_create_checksum(context,
98 crypto,
99 KRB5_KU_KRB_SAFE_CKSUM,
100 0,
108 buf + buf_size - len,
101 buf,
109 len,
110 &s.cksum);
111 krb5_crypto_destroy(context, crypto);
112 if (ret) {
113 free (buf);
114 return ret;
115 }
116
102 len,
103 &s.cksum);
104 krb5_crypto_destroy(context, crypto);
105 if (ret) {
106 free (buf);
107 return ret;
108 }
109
117 buf_size = length_KRB_SAFE(&s);
118 tmp = realloc(buf, buf_size);
119 if(tmp == NULL) {
120 free(buf);
121 krb5_set_error_string (context, "malloc: out of memory");
122 return ENOMEM;
123 }
124 buf = tmp;
125
126 ret = encode_KRB_SAFE (buf + buf_size - 1, buf_size, &s, &len);
110 free(buf);
111 ASN1_MALLOC_ENCODE(KRB_SAFE, buf, buf_size, &s, &len, ret);
127 free_Checksum (&s.cksum);
112 free_Checksum (&s.cksum);
113 if(ret)
114 return ret;
115 if(buf_size != len)
116 krb5_abortx(context, "internal error in ASN.1 encoder");
128
129 outbuf->length = len;
117
118 outbuf->length = len;
130 outbuf->data = malloc (len);
131 if (outbuf->data == NULL) {
132 free (buf);
133 krb5_set_error_string (context, "malloc: out of memory");
134 return ENOMEM;
135 }
136 memcpy (outbuf->data, buf + buf_size - len, len);
137 free (buf);
119 outbuf->data = buf;
138 if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE)
139 auth_context->local_seqnumber =
140 (auth_context->local_seqnumber + 1) & 0xFFFFFFFF;
141 return 0;
142}
120 if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE)
121 auth_context->local_seqnumber =
122 (auth_context->local_seqnumber + 1) & 0xFFFFFFFF;
123 return 0;
124}