517 Index: crypto/sha/Makefile |
517 Index: crypto/sha/Makefile |
518 =================================================================== |
518 =================================================================== |
519 diff -ru openssl-1.0.1e/crypto/sha/Makefile openssl-1.0.1e/crypto/sha/Makefile |
519 diff -ru openssl-1.0.1e/crypto/sha/Makefile openssl-1.0.1e/crypto/sha/Makefile |
520 --- openssl-1.0.1e/crypto/sha/Makefile 2011-05-24 17:02:24.000000000 -0700 |
520 --- openssl-1.0.1e/crypto/sha/Makefile 2011-05-24 17:02:24.000000000 -0700 |
521 +++ openssl-1.0.1e/crypto/sha/Makefile 2011-07-27 10:48:17.817470000 -0700 |
521 +++ openssl-1.0.1e/crypto/sha/Makefile 2011-07-27 10:48:17.817470000 -0700 |
522 @@ -66,9 +66,9 @@ |
522 @@ -68,9 +68,9 @@ |
523 sha1-x86_64.s: asm/sha1-x86_64.pl; $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@ |
523 sha1-x86_64.s: asm/sha1-x86_64.pl; $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@ |
524 sha256-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@ |
524 sha256-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@ |
525 sha512-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@ |
525 sha512-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@ |
526 -sha1-sparcv9.s: asm/sha1-sparcv9.pl; $(PERL) asm/sha1-sparcv9.pl $@ $(CFLAGS) |
526 -sha1-sparcv9.s: asm/sha1-sparcv9.pl; $(PERL) asm/sha1-sparcv9.pl $@ $(CFLAGS) |
527 -sha256-sparcv9.s:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS) |
527 -sha256-sparcv9.s:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS) |
1189 + DES_EDE_KEY *dat = data(ctx); |
1189 + DES_EDE_KEY *dat = data(ctx); |
1190 + |
1190 + |
1191 #ifdef KSSL_DEBUG |
1191 #ifdef KSSL_DEBUG |
1192 { |
1192 { |
1193 int i; |
1193 int i; |
1194 @@ -132,10 +152,16 @@ static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
1194 @@ -132,10 +154,16 @@ |
1195 printf("\n"); |
1195 printf("\n"); |
1196 } |
1196 } |
1197 #endif /* KSSL_DEBUG */ |
1197 #endif /* KSSL_DEBUG */ |
1198 + if (dat->stream.cbc) |
1198 + if (dat->stream.cbc) |
1199 + { |
1199 + { |
1200 + (*dat->stream.cbc)(in,out,inl,&dat->ks,ctx->iv); |
1200 + (*dat->stream.cbc)(in,out,inl,&dat->ks,ctx->iv); |
1201 + return 1; |
1201 + return 1; |
1202 + } |
1202 + } |
1203 + |
1203 + |
1204 if (inl>=EVP_MAXCHUNK) |
1204 while (inl>=EVP_MAXCHUNK) |
1205 { |
1205 { |
1206 DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, |
1206 DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, |
1207 - &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, |
1207 - &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, |
1208 + &dat->ks1, &dat->ks2, &dat->ks3, |
1208 + &dat->ks1, &dat->ks2, &dat->ks3, |
1209 (DES_cblock *)ctx->iv, ctx->encrypt); |
1209 (DES_cblock *)ctx->iv, ctx->encrypt); |
2219 - vpaes_set_encrypt_key(key,ctx->key_len*8,&gctx->ks); |
2219 - vpaes_set_encrypt_key(key,ctx->key_len*8,&gctx->ks); |
2220 + vpaes_set_encrypt_key(key,ctx->key_len*8,&gctx->ks.ks); |
2220 + vpaes_set_encrypt_key(key,ctx->key_len*8,&gctx->ks.ks); |
2221 CRYPTO_gcm128_init(&gctx->gcm,&gctx->ks, |
2221 CRYPTO_gcm128_init(&gctx->gcm,&gctx->ks, |
2222 (block128_f)vpaes_encrypt); |
2222 (block128_f)vpaes_encrypt); |
2223 gctx->ctr = NULL; |
2223 gctx->ctr = NULL; |
2224 @@ -846,7 +1220,7 @@ |
2224 @@ -849,7 +1223,7 @@ |
2225 break; |
|
2226 } |
|
2227 #endif |
2225 #endif |
|
2226 (void)0; /* terminate potentially open 'else' */ |
|
2227 |
2228 - AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks); |
2228 - AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks); |
2229 + AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks); |
2229 + AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks); |
2230 CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f)AES_encrypt); |
2230 CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f)AES_encrypt); |
2231 #ifdef AES_CTR_ASM |
2231 #ifdef AES_CTR_ASM |
2232 gctx->ctr = (ctr128_f)AES_ctr32_encrypt; |
2232 gctx->ctr = (ctr128_f)AES_ctr32_encrypt; |
2233 @@ -1077,17 +1451,17 @@ |
2233 @@ -1080,17 +1454,17 @@ |
2234 { |
2234 { |
2235 if (enc) |
2235 if (enc) |
2236 { |
2236 { |
2237 - vpaes_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1); |
2237 - vpaes_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1); |
2238 + vpaes_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); |
2238 + vpaes_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); |
2243 - vpaes_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1); |
2243 - vpaes_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1); |
2244 + vpaes_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); |
2244 + vpaes_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); |
2245 xctx->xts.block1 = (block128_f)vpaes_decrypt; |
2245 xctx->xts.block1 = (block128_f)vpaes_decrypt; |
2246 } |
2246 } |
2247 |
2247 |
2248 vpaes_set_encrypt_key(key + ctx->key_len/2, |
2248 vpaes_set_encrypt_key(key + ctx->key_len/2, |
2249 - ctx->key_len * 4, &xctx->ks2); |
2249 - ctx->key_len * 4, &xctx->ks2); |
2250 + ctx->key_len * 4, &xctx->ks2.ks); |
2250 + ctx->key_len * 4, &xctx->ks2.ks); |
2251 xctx->xts.block2 = (block128_f)vpaes_encrypt; |
2251 xctx->xts.block2 = (block128_f)vpaes_encrypt; |
2252 |
2252 |
2253 xctx->xts.key1 = &xctx->ks1; |
2253 xctx->xts.key1 = &xctx->ks1; |
2254 @@ -1096,17 +1470,17 @@ |
2254 @@ -1102,17 +1476,17 @@ |
2255 #endif |
2255 |
2256 if (enc) |
2256 if (enc) |
2257 { |
2257 { |
2258 - AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1); |
2258 - AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1); |
2259 + AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); |
2259 + AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); |
2260 xctx->xts.block1 = (block128_f)AES_encrypt; |
2260 xctx->xts.block1 = (block128_f)AES_encrypt; |
2270 - ctx->key_len * 4, &xctx->ks2); |
2270 - ctx->key_len * 4, &xctx->ks2); |
2271 + ctx->key_len * 4, &xctx->ks2.ks); |
2271 + ctx->key_len * 4, &xctx->ks2.ks); |
2272 xctx->xts.block2 = (block128_f)AES_encrypt; |
2272 xctx->xts.block2 = (block128_f)AES_encrypt; |
2273 |
2273 |
2274 xctx->xts.key1 = &xctx->ks1; |
2274 xctx->xts.key1 = &xctx->ks1; |
2275 @@ -1217,7 +1591,7 @@ |
2275 @@ -1223,7 +1597,7 @@ |
2276 #ifdef VPAES_CAPABLE |
2276 #ifdef VPAES_CAPABLE |
2277 if (VPAES_CAPABLE) |
2277 if (VPAES_CAPABLE) |
2278 { |
2278 { |
2279 - vpaes_set_encrypt_key(key, ctx->key_len*8, &cctx->ks); |
2279 - vpaes_set_encrypt_key(key, ctx->key_len*8, &cctx->ks); |
2280 + vpaes_set_encrypt_key(key, ctx->key_len*8, &cctx->ks.ks); |
2280 + vpaes_set_encrypt_key(key, ctx->key_len*8, &cctx->ks.ks); |
2281 CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, |
2281 CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, |
2282 &cctx->ks, (block128_f)vpaes_encrypt); |
2282 &cctx->ks, (block128_f)vpaes_encrypt); |
2283 cctx->str = NULL; |
2283 cctx->str = NULL; |
2284 @@ -1225,7 +1599,7 @@ |
2284 @@ -1231,7 +1605,7 @@ |
2285 break; |
2285 break; |
2286 } |
2286 } |
2287 #endif |
2287 #endif |
2288 - AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks); |
2288 - AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks); |
2289 + AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks.ks); |
2289 + AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks.ks); |
2290 CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, |
2290 CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, |
2291 &cctx->ks, (block128_f)AES_encrypt); |
2291 &cctx->ks, (block128_f)AES_encrypt); |
2292 cctx->str = NULL; |
2292 cctx->str = NULL; |
2293 @@ -1313,5 +1687,4 @@ |
2293 @@ -1319,5 +1693,4 @@ |
2294 BLOCK_CIPHER_custom(NID_aes,192,1,12,ccm,CCM,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS) |
2294 BLOCK_CIPHER_custom(NID_aes,192,1,12,ccm,CCM,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS) |
2295 BLOCK_CIPHER_custom(NID_aes,256,1,12,ccm,CCM,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS) |
2295 BLOCK_CIPHER_custom(NID_aes,256,1,12,ccm,CCM,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS) |
2296 |
2296 |
2297 -#endif |
2297 -#endif |
2298 #endif |
2298 #endif |