Fix major cockup with short keys in CAST-128.

[openssl.git] / crypto / cast / c_enc.c

diff --git a/crypto/cast/c_enc.c b/crypto/cast/c_enc.c
index d998dd4953e8f2595f17ae74862cb82090874794..5e6ecb31f5a26b060d2af3c3bf6dd0e68018e1bb 100644 (file)
--- a/crypto/cast/c_enc.c
+++ b/crypto/cast/c_enc.c
@@ -81,10 +81,13 @@ CAST_KEY *key;
        E_CAST( 9,k,r,l,+,^,-);
        E_CAST(10,k,l,r,^,-,+);
        E_CAST(11,k,r,l,-,+,^);
-       E_CAST(12,k,l,r,+,^,-);
-       E_CAST(13,k,r,l,^,-,+);
-       E_CAST(14,k,l,r,-,+,^);
-       E_CAST(15,k,r,l,+,^,-);
+       if(!k->short_key)
+           {
+           E_CAST(12,k,l,r,+,^,-);
+           E_CAST(13,k,r,l,^,-,+);
+           E_CAST(14,k,l,r,-,+,^);
+           E_CAST(15,k,r,l,+,^,-);
+           }
 
        data[1]=l&0xffffffffL;
        data[0]=r&0xffffffffL;
@@ -100,10 +103,13 @@ CAST_KEY *key;
        l=data[0];
        r=data[1];
 
-       E_CAST(15,k,l,r,+,^,-);
-       E_CAST(14,k,r,l,-,+,^);
-       E_CAST(13,k,l,r,^,-,+);
-       E_CAST(12,k,r,l,+,^,-);
+       if(!k->short_key)
+           {
+           E_CAST(15,k,l,r,+,^,-);
+           E_CAST(14,k,r,l,-,+,^);
+           E_CAST(13,k,l,r,^,-,+);
+           E_CAST(12,k,r,l,+,^,-);
+           }
        E_CAST(11,k,l,r,-,+,^);
        E_CAST(10,k,r,l,^,-,+);
        E_CAST( 9,k,l,r,+,^,-);