/[smeserver]/rpms/openssl/sme8/openssl-fips-0.9.8e-aescfb.patch
ViewVC logotype

Contents of /rpms/openssl/sme8/openssl-fips-0.9.8e-aescfb.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Tue Feb 18 03:03:08 2014 UTC (10 years, 8 months ago) by wellsi
Branch: MAIN
CVS Tags: openssl-0_9_8e-28_el5_sme, openssl-0_9_8e-33_1_el5_sme, openssl-0_9_8e-32_1_el5_sme, openssl-0_9_8e-27_1_el5_sme, openssl-0_9_8e-27_el5_10_1, openssl-0_9_8e-31_1_el5_sme, HEAD
Branch point for: upstream
Initial import

1 Add flag EVP_CIPH_FLAG_LENGTH_BITS to indicate that input buffer length
2 is in bits not bytes. The Monte Carlo FIPS140-2 CFB1 tests require this.
3 [Steve Henson]
4
5 openssl/crypto/evp/evp.h 1.112.2.4.2.8 -> 1.112.2.4.2.9
6
7 --- openssl/crypto/evp/evp.h 2007/12/14 01:15:44 1.112.2.4.2.8
8 +++ openssl/crypto/evp/evp.h 2007/12/26 19:04:57 1.112.2.4.2.9
9 @@ -378,6 +378,8 @@
10 #define EVP_CIPH_FLAG_NON_FIPS_ALLOW 0x800
11 /* Allow use default ASN1 get/set iv */
12 #define EVP_CIPH_FLAG_DEFAULT_ASN1 0x1000
13 +/* Buffer length in bits not bytes: CFB1 mode only */
14 +#define EVP_CIPH_FLAG_LENGTH_BITS 0x2000
15
16 /* ctrl() values */
17
18 @@ -470,6 +472,7 @@
19 #define M_EVP_MD_CTX_type(e) M_EVP_MD_type(M_EVP_MD_CTX_md(e))
20 #define M_EVP_MD_CTX_md(e) ((e)->digest)
21
22 +#define M_EVP_CIPHER_CTX_set_flags(ctx,flgs) ((ctx)->flags|=(flgs))
23
24 int EVP_MD_type(const EVP_MD *md);
25 #define EVP_MD_nid(e) EVP_MD_type(e)
26
27 openssl/crypto/evp/evp_locl.h 1.10.2.1.2.3 -> 1.10.2.1.2.4
28
29 --- openssl/crypto/evp/evp_locl.h 2007/07/08 19:20:48 1.10.2.1.2.3
30 +++ openssl/crypto/evp/evp_locl.h 2007/12/26 19:04:57 1.10.2.1.2.4
31 @@ -92,7 +92,7 @@
32 #define BLOCK_CIPHER_func_cfb(cname, cprefix, cbits, kstruct, ksched) \
33 static int cname##_cfb##cbits##_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \
34 {\
35 - cprefix##_cfb##cbits##_encrypt(in, out, (long)(cbits==1?inl*8:inl), &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num, ctx->encrypt);\
36 + cprefix##_cfb##cbits##_encrypt(in, out, (long)((cbits==1) && !(ctx->flags & EVP_CIPH_FLAG_LENGTH_BITS) ?inl*8:inl), &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num, ctx->encrypt);\
37 return 1;\
38 }
39
40
41 openssl/fips/aes/fips_aesavs.c 1.1.4.3 -> 1.1.4.4
42
43 --- openssl/fips/aes/fips_aesavs.c 2007/09/21 18:00:23 1.1.4.3
44 +++ openssl/fips/aes/fips_aesavs.c 2007/12/26 19:04:58 1.1.4.4
45 @@ -212,6 +212,8 @@
46 }
47 if (EVP_CipherInit_ex(ctx, cipher, NULL, aKey, iVec, dir) <= 0)
48 return 0;
49 + if(!strcasecmp(amode,"CFB1"))
50 + M_EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS);
51 if (dir)
52 EVP_Cipher(ctx, ciphertext, plaintext, len);
53 else
54 @@ -377,9 +379,11 @@
55 case CFB1:
56 if(j == 0)
57 {
58 +#if 0
59 /* compensate for wrong endianness of input file */
60 if(i == 0)
61 ptext[0][0]<<=7;
62 +#endif
63 ret = AESTest(&ctx,amode,akeysz,key[i],iv[i],dir,
64 ptext[j], ctext[j], len);
65 }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed