From: Tom Yu <tlyu@mit.edu>
Date: Wed, 15 Apr 2009 20:07:12 +0000 (+0000)
Subject: pull up r22152 from trunk
X-Git-Tag: krb5-1.7-beta1~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=34e54a0a44d4045d62f41c88fdfcd2b4d3cb5157;p=krb5.git

pull up r22152 from trunk

 ------------------------------------------------------------------------
 r22152 | hartmans | 2009-03-31 18:36:03 -0400 (Tue, 31 Mar 2009) | 6 lines
 Changed paths:
    M /trunk/src/lib/crypto/etypes.c

 ticket: 6437
 target_version: 1.7
 tags: pullup
 Subject: mark export grade RC4 as weak

 Set the weak enctype flag on the 40-bit RC4.

ticket: 6437
version_fixed: 1.7

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22242 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/crypto/etypes.c b/src/lib/crypto/etypes.c
index 1c969ae02..e7f547b91 100644
--- a/src/lib/crypto/etypes.c
+++ b/src/lib/crypto/etypes.c
@@ -137,7 +137,8 @@ const struct krb5_keytypes krb5_enctypes_list[] = {
       NULL, /*PRF*/
       CKSUMTYPE_HMAC_MD5_ARCFOUR,
       &krb5int_aead_arcfour,
-      0 /*flags*/ },
+      ETYPE_WEAK
+    },
 
     { ENCTYPE_AES128_CTS_HMAC_SHA1_96,
       "aes128-cts-hmac-sha1-96", { "aes128-cts" },