svn rev #21761: trunk/src/lib/gssapi/krb5/
raeburn@MIT.EDU
raeburn at MIT.EDU
Fri Jan 16 19:06:14 EST 2009
http://src.mit.edu/fisheye/changelog/krb5/?cs=21761
Commit By: raeburn
Log Message:
patch from Luke - minor cleanup
Changed Files:
U trunk/src/lib/gssapi/krb5/k5sealv3.c
U trunk/src/lib/gssapi/krb5/k5sealv3iov.c
U trunk/src/lib/gssapi/krb5/util_crypt.c
Modified: trunk/src/lib/gssapi/krb5/k5sealv3.c
===================================================================
--- trunk/src/lib/gssapi/krb5/k5sealv3.c 2009-01-17 00:04:49 UTC (rev 21760)
+++ trunk/src/lib/gssapi/krb5/k5sealv3.c 2009-01-17 00:06:06 UTC (rev 21761)
@@ -320,10 +320,9 @@
krb5_keyblock *key;
krb5_cksumtype cksumtype;
- if(ctx->big_endian != 0)
- goto defective;
+ if (ctx->big_endian != 0)
+ goto defective;
-
if (qop_state)
*qop_state = GSS_C_QOP_DEFAULT;
Modified: trunk/src/lib/gssapi/krb5/k5sealv3iov.c
===================================================================
--- trunk/src/lib/gssapi/krb5/k5sealv3iov.c 2009-01-17 00:04:49 UTC (rev 21760)
+++ trunk/src/lib/gssapi/krb5/k5sealv3iov.c 2009-01-17 00:06:06 UTC (rev 21761)
@@ -298,9 +298,8 @@
int conf_flag = 0;
if (ctx->big_endian != 0)
- return GSS_S_DEFECTIVE_TOKEN;
+ return GSS_S_DEFECTIVE_TOKEN;
-
if (qop_state != NULL)
*qop_state = GSS_C_QOP_DEFAULT;
Modified: trunk/src/lib/gssapi/krb5/util_crypt.c
===================================================================
--- trunk/src/lib/gssapi/krb5/util_crypt.c 2009-01-17 00:04:49 UTC (rev 21760)
+++ trunk/src/lib/gssapi/krb5/util_crypt.c 2009-01-17 00:06:06 UTC (rev 21761)
@@ -99,9 +99,10 @@
*cksumtype = 0;
ctx->proto = 0;
+
if (ctx->enc == NULL) {
- ctx->signalg = -1;
- ctx->sealalg = -1;
+ ctx->signalg = -1;
+ ctx->sealalg = -1;
}
code = krb5int_accessor(&kaccess, KRB5INT_ACCESS_VERSION);
@@ -109,9 +110,9 @@
return code;
code = (*kaccess.krb5int_c_mandatory_cksumtype)(context, subkey->enctype,
- cksumtype);
+ cksumtype);
if (code != 0)
- return code;
+ return code;
switch (subkey->enctype) {
case ENCTYPE_DES_CBC_MD5:
@@ -154,7 +155,7 @@
break;
default:
ctx->proto = 1;
-
+ break;
}
return 0;
More information about the cvs-krb5
mailing list