r4279@bucket (orig r269): kcr | 2008-01-21 14:09:14 -0500

 no more NOENCRYPTION

git-svn-id: svn://svn.1ts.org/debian/trunk@341 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/lib/ZCkAuth.c b/zephyr/lib/ZCkAuth.c
index a85146364b4696c283cd3ba30932224b66f64efe..94de79322cc906b934214408d0131358906fadbc 100644 (file)
--- a/zephyr/lib/ZCkAuth.c
+++ b/zephyr/lib/ZCkAuth.c
@@ -52,14 +52,11 @@ ZCheckAuthentication(ZNotice_t *notice,
 
     session = (C_Block *)cred.session;
 
-#ifdef NOENCRYPTION
-    our_checksum = 0;
-#else
     our_checksum = des_quad_cksum(notice->z_packet, NULL, 
                                  notice->z_default_format+
                                  strlen(notice->z_default_format)+1-
                                  notice->z_packet, 0, session);
-#endif
+
     /* if mismatched checksum, then the packet was corrupted */
     return ((our_checksum == notice->z_checksum) ? ZAUTH_YES : ZAUTH_FAILED);
 #else

diff --git a/zephyr/lib/ZFmtAuth.c b/zephyr/lib/ZFmtAuth.c
index 21b133b6480e5572e8c268f3761ed7f5b588bdce..821e6086a24520b0e81329b12ea7218b05fabcfa 100644 (file)
--- a/zephyr/lib/ZFmtAuth.c
+++ b/zephyr/lib/ZFmtAuth.c
@@ -37,12 +37,9 @@ ZFormatAuthenticNotice(ZNotice_t *notice,
                                    &hdrlen, &ptr, NULL)) != ZERR_NONE)
        return (retval);
 
-#ifdef NOENCRYPTION
-    newnotice.z_checksum = 0;
-#else
     newnotice.z_checksum =
        (ZChecksum_t)des_quad_cksum((unsigned char *)buffer, NULL, ptr - buffer, 0, (C_Block *)session);
-#endif
+
     if ((retval = Z_FormatRawHeader(&newnotice, buffer, buffer_len,
                                    &hdrlen, NULL, NULL)) != ZERR_NONE)
        return (retval);