openssl/crypto/evp/e_camellia.c - Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: openssl/crypto/evp/e_camellia.c

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

OLD	NEW
1 /* crypto/evp/e_camellia.c -- mode:C; c-file-style: "eay" -- */	1 /* crypto/evp/e_camellia.c -- mode:C; c-file-style: "eay" -- */

2 /* ====================================================================	2 /* ====================================================================

3 * Copyright (c) 2006 The OpenSSL Project. All rights reserved.	3 * Copyright (c) 2006 The OpenSSL Project. All rights reserved.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 *	8 *

9 * 1. Redistributions of source code must retain the above copyright	9 * 1. Redistributions of source code must retain the above copyright

10 * notice, this list of conditions and the following disclaimer.	10 * notice, this list of conditions and the following disclaimer.

(...skipping 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 EVP_CIPHER_set_asn1_iv,	86 EVP_CIPHER_set_asn1_iv,

87 EVP_CIPHER_get_asn1_iv,	87 EVP_CIPHER_get_asn1_iv,

88 NULL)	88 NULL)

89 IMPLEMENT_BLOCK_CIPHER(camellia_256, ks, Camellia, EVP_CAMELLIA_KEY,	89 IMPLEMENT_BLOCK_CIPHER(camellia_256, ks, Camellia, EVP_CAMELLIA_KEY,

90 NID_camellia_256, 16, 32, 16, 128,	90 NID_camellia_256, 16, 32, 16, 128,

91 0, camellia_init_key, NULL,	91 0, camellia_init_key, NULL,

92 EVP_CIPHER_set_asn1_iv,	92 EVP_CIPHER_set_asn1_iv,

93 EVP_CIPHER_get_asn1_iv,	93 EVP_CIPHER_get_asn1_iv,

94 NULL)	94 NULL)

95	95

96 #define IMPLEMENT_CAMELLIA_CFBR(ksize,cbits)» IMPLEMENT_CFBR(camellia,Camellia ,EVP_CAMELLIA_KEY,ks,ksize,cbits,16,0)	96 #define IMPLEMENT_CAMELLIA_CFBR(ksize,cbits)» IMPLEMENT_CFBR(camellia,Camellia ,EVP_CAMELLIA_KEY,ks,ksize,cbits,16)

97	97

98 IMPLEMENT_CAMELLIA_CFBR(128,1)	98 IMPLEMENT_CAMELLIA_CFBR(128,1)

99 IMPLEMENT_CAMELLIA_CFBR(192,1)	99 IMPLEMENT_CAMELLIA_CFBR(192,1)

100 IMPLEMENT_CAMELLIA_CFBR(256,1)	100 IMPLEMENT_CAMELLIA_CFBR(256,1)

101	101

102 IMPLEMENT_CAMELLIA_CFBR(128,8)	102 IMPLEMENT_CAMELLIA_CFBR(128,8)

103 IMPLEMENT_CAMELLIA_CFBR(192,8)	103 IMPLEMENT_CAMELLIA_CFBR(192,8)

104 IMPLEMENT_CAMELLIA_CFBR(256,8)	104 IMPLEMENT_CAMELLIA_CFBR(256,8)

105	105

106	106

(...skipping 15 matching lines...) Expand all Loading...
122 return 1;	122 return 1;

123 }	123 }

124	124

125 #else	125 #else

126	126

127 # ifdef PEDANTIC	127 # ifdef PEDANTIC

128 static void *dummy=&dummy;	128 static void *dummy=&dummy;

129 # endif	129 # endif

130	130

131 #endif	131 #endif

OLD	NEW

« no previous file with comments | « openssl/crypto/evp/e_aes.c ('k') | openssl/crypto/evp/e_des.c » ('j') | no next file with comments »