Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Side by Side Diff: openssl/crypto/des/des_locl.h

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « openssl/crypto/des/des_lib.c ('k') | openssl/crypto/des/ecb_enc.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* crypto/des/des_locl.h */ 1 /* crypto/des/des_locl.h */
2 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) 2 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 * derivative of this code cannot be changed. i.e. this code cannot simply be 54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence 55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59 #ifndef HEADER_DES_LOCL_H 59 #ifndef HEADER_DES_LOCL_H
60 #define HEADER_DES_LOCL_H 60 #define HEADER_DES_LOCL_H
61 61
62 #include <openssl/e_os2.h> 62 #include <openssl/e_os2.h>
63 63
64 #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) 64 #if defined(OPENSSL_SYS_WIN32)
65 #ifndef OPENSSL_SYS_MSDOS 65 #ifndef OPENSSL_SYS_MSDOS
66 #define OPENSSL_SYS_MSDOS 66 #define OPENSSL_SYS_MSDOS
67 #endif 67 #endif
68 #endif 68 #endif
69 69
70 #include <stdio.h> 70 #include <stdio.h>
71 #include <stdlib.h> 71 #include <stdlib.h>
72 72
73 #ifndef OPENSSL_SYS_MSDOS 73 #ifndef OPENSSL_SYS_MSDOS
74 #if !defined(OPENSSL_SYS_VMS) || defined(__DECC) 74 #if !defined(OPENSSL_SYS_VMS) || defined(__DECC)
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 PERM_OP(r,l,tt, 8,0x00ff00ffL); \ 418 PERM_OP(r,l,tt, 8,0x00ff00ffL); \
419 PERM_OP(l,r,tt, 2,0x33333333L); \ 419 PERM_OP(l,r,tt, 2,0x33333333L); \
420 PERM_OP(r,l,tt,16,0x0000ffffL); \ 420 PERM_OP(r,l,tt,16,0x0000ffffL); \
421 PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \ 421 PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \
422 } 422 }
423 423
424 extern const DES_LONG DES_SPtrans[8][64]; 424 extern const DES_LONG DES_SPtrans[8][64];
425 425
426 void fcrypt_body(DES_LONG *out,DES_key_schedule *ks, 426 void fcrypt_body(DES_LONG *out,DES_key_schedule *ks,
427 DES_LONG Eswap0, DES_LONG Eswap1); 427 DES_LONG Eswap0, DES_LONG Eswap1);
428
429 #ifdef OPENSSL_SMALL_FOOTPRINT
430 #undef DES_UNROLL
428 #endif 431 #endif
432 #endif
OLDNEW
« no previous file with comments | « openssl/crypto/des/des_lib.c ('k') | openssl/crypto/des/ecb_enc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698