feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

final powerPC support modification

Browse Source
This commit is contained in:
kaleb-himes
2015-02-17 14:26:01 -07:00
parent 8d5bba7962
commit 3a150da10f
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/aes.c
View File

@ -3032,20 +3032,20 @@ static void GMULT(word64* X, word64* Y)
word64 y = Y[i]; word64 y = Y[i];
for (j = 0; j < 64; j++) for (j = 0; j < 64; j++)
{ {
if (y & 0x8000000000000000) { if (y & 0x8000000000000000ULL) {
Z[0] ^= V[0]; Z[0] ^= V[0];
Z[1] ^= V[1]; Z[1] ^= V[1];
} }
if (V[1] & 0x0000000000000001) { if (V[1] & 0x0000000000000001) {
V[1] >>= 1; V[1] >>= 1;
V[1] |= ((V[0] & 0x0000000000000001) ? 0x8000000000000000 : 0); V[1] |= ((V[0] & 0x0000000000000001) ? 0x8000000000000000ULL : 0);
V[0] >>= 1; V[0] >>= 1;
V[0] ^= 0xE100000000000000; V[0] ^= 0xE100000000000000ULL;
} }
else { else {
V[1] >>= 1; V[1] >>= 1;
V[1] |= ((V[0] & 0x0000000000000001) ? 0x8000000000000000 : 0); V[1] |= ((V[0] & 0x0000000000000001) ? 0x8000000000000000ULL : 0);
V[0] >>= 1; V[0] >>= 1;
} }
y <<= 1; y <<= 1;

10
wolfssl/sniffer.h
View File

@ -40,16 +40,18 @@
extern "C" { extern "C" {
#endif #endif
/* @param typeK: (formerly keyType) was shadowing a global declaration in
* wolfssl/wolfcrypt/asn.h line 175
*/
WOLFSSL_API WOLFSSL_API
SSL_SNIFFER_API int ssl_SetPrivateKey(const char* address, int port, SSL_SNIFFER_API int ssl_SetPrivateKey(const char* address, int port,
const char* keyFile, int keyType, const char* keyFile, int typeK,
const char* password, char* error); const char* password, char* error);
WOLFSSL_API WOLFSSL_API
SSL_SNIFFER_API int ssl_SetNamedPrivateKey(const char* name, SSL_SNIFFER_API int ssl_SetNamedPrivateKey(const char* name,
const char* address, int port, const char* address, int port,
const char* keyFile, int keyType, const char* keyFile, int typeK,
const char* password, char* error); const char* password, char* error);
WOLFSSL_API WOLFSSL_API
@ -65,7 +67,7 @@ WOLFSSL_API void ssl_InitSniffer(void);
WOLFSSL_API void ssl_FreeSniffer(void); WOLFSSL_API void ssl_FreeSniffer(void);
/* ssl_SetPrivateKey keyTypes */ /* ssl_SetPrivateKey typeKs */
enum { enum {
FILETYPE_PEM = 1, FILETYPE_PEM = 1,
FILETYPE_DER = 2, FILETYPE_DER = 2,