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

(wrap_des3): use the checksum as ivec when encrypting the sequence

Browse Source 
number


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9314 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-12-08 05:06:04 +00:00
parent 5d542aef42
commit e10e6f2c26
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/gssapi/krb5/wrap.c
View File

@@ -302,7 +302,8 @@ wrap_des3
(context_handle->more_flags & LOCAL) ? 0 : 0xFF, (context_handle->more_flags & LOCAL) ? 0 : 0xFF,
4); 4);
ret = krb5_crypto_init(gssapi_krb5_context, key, ETYPE_DES3_CBC_NONE,
ret = krb5_crypto_init(gssapi_krb5_context, key, ETYPE_DES3_CBC_NONE_IVEC,
&crypto); &crypto);
if (ret) { if (ret) {
free (output_message_buffer->value); free (output_message_buffer->value);
@@ -310,10 +311,16 @@ wrap_des3
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
ret = krb5_encrypt (gssapi_krb5_context, {
crypto, des_cblock ivec;
KRB5_KU_USAGE_SEQ,
seq, 8, &encdata); memcpy (&ivec, p + 8, 8);
ret = krb5_encrypt_ivec (gssapi_krb5_context,
crypto,
KRB5_KU_USAGE_SEQ,
seq, 8, &encdata,
&ivec);
}
krb5_crypto_destroy (gssapi_krb5_context, crypto); krb5_crypto_destroy (gssapi_krb5_context, crypto);
if (ret) { if (ret) {
free (output_message_buffer->value); free (output_message_buffer->value);

17
lib/gssapi/wrap.c
View File

@@ -302,7 +302,8 @@ wrap_des3
(context_handle->more_flags & LOCAL) ? 0 : 0xFF, (context_handle->more_flags & LOCAL) ? 0 : 0xFF,
4); 4);
ret = krb5_crypto_init(gssapi_krb5_context, key, ETYPE_DES3_CBC_NONE,
ret = krb5_crypto_init(gssapi_krb5_context, key, ETYPE_DES3_CBC_NONE_IVEC,
&crypto); &crypto);
if (ret) { if (ret) {
free (output_message_buffer->value); free (output_message_buffer->value);
@@ -310,10 +311,16 @@ wrap_des3
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
ret = krb5_encrypt (gssapi_krb5_context, {
crypto, des_cblock ivec;
KRB5_KU_USAGE_SEQ,
seq, 8, &encdata); memcpy (&ivec, p + 8, 8);
ret = krb5_encrypt_ivec (gssapi_krb5_context,
crypto,
KRB5_KU_USAGE_SEQ,
seq, 8, &encdata,
&ivec);
}
krb5_crypto_destroy (gssapi_krb5_context, crypto); krb5_crypto_destroy (gssapi_krb5_context, crypto);
if (ret) { if (ret) {
free (output_message_buffer->value); free (output_message_buffer->value);