diff options
author | Ezra Peisach <epeisach@mit.edu> | 1995-09-12 16:43:27 +0000 |
---|---|---|
committer | Ezra Peisach <epeisach@mit.edu> | 1995-09-12 16:43:27 +0000 |
commit | 88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0 (patch) | |
tree | 22fbd2670986bdd23c988858f9baa0af2fe25515 /src/lib/krb5/krb/t_ser.c | |
parent | 43ce6c50a83b8550ed083a7362fa9528e50d2fc0 (diff) | |
download | krb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.tar.gz krb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.tar.xz krb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.zip |
Reintegrate Macintosh changes
t_ser.c: Work around an optimizer bug in gcc under OSF/1 2.1.
The timeofday calls were left in the stage as described in the ChangeLog
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6766 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/krb/t_ser.c')
-rw-r--r-- | src/lib/krb5/krb/t_ser.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/krb5/krb/t_ser.c b/src/lib/krb5/krb/t_ser.c index ad635d97db..08235ec9d1 100644 --- a/src/lib/krb5/krb/t_ser.c +++ b/src/lib/krb5/krb/t_ser.c @@ -293,8 +293,7 @@ ser_acontext_test(kcontext, verbose) KV5M_AUTH_CONTEXT))) { memset(&ukeyblock, 0, sizeof(ukeyblock)); memset(keydata, 0, sizeof(keydata)); - ukeyblock.keytype = KEYTYPE_DES; - ukeyblock.etype = ETYPE_DES_CBC_MD5; + ukeyblock.enctype = ENCTYPE_DES_CBC_MD5; ukeyblock.length = sizeof(keydata); ukeyblock.contents = keydata; keydata[0] = 0xde; @@ -510,7 +509,7 @@ ser_eblock_test(kcontext, verbose) memset(&eblock, 0, sizeof(krb5_encrypt_block)); eblock.magic = KV5M_ENCRYPT_BLOCK; - krb5_use_cstype(kcontext, &eblock, DEFAULT_KDC_ETYPE); + krb5_use_enctype(kcontext, &eblock, DEFAULT_KDC_ENCTYPE); if (!(kret = ser_data(verbose, "> NULL eblock", (krb5_pointer) &eblock, KV5M_ENCRYPT_BLOCK))) { eblock.priv = (krb5_pointer) ser_eblock_test; @@ -520,8 +519,7 @@ ser_eblock_test(kcontext, verbose) KV5M_ENCRYPT_BLOCK))) { memset(&ukeyblock, 0, sizeof(ukeyblock)); memset(keydata, 0, sizeof(keydata)); - ukeyblock.keytype = KEYTYPE_DES; - ukeyblock.etype = ETYPE_DES_CBC_MD5; + ukeyblock.enctype = ENCTYPE_DES_CBC_MD5; ukeyblock.length = sizeof(keydata); ukeyblock.contents = keydata; keydata[0] = 0xde; @@ -591,7 +589,11 @@ ser_cksum_test(kcontext, verbose) checksum.checksum_type = 123; checksum.length = sizeof(ckdata); checksum.contents = ckdata; - memcpy(ckdata, (char *) ser_cksum_test, sizeof(ckdata)); +#if 0 + memcpy(ckdata, (char *) &ser_cksum_test, sizeof(ckdata)); +#else + memcpy(ckdata, (char *) &ser_princ_test, sizeof(ckdata)); +#endif if (!(kret = ser_data(verbose, "> checksum with data", (krb5_pointer) &checksum, KV5M_CHECKSUM))) { if (verbose) |