Fix make order and types with Linux

pull/210/head
Eric Blankenhorn 2020-06-16 16:06:51 -05:00
parent 61bda8dbdf
commit 4d3763952c
3 changed files with 9 additions and 9 deletions

View File

@ -57,7 +57,7 @@ int ecc_sign_verify_test(enum wc_HashType hash_type, enum wc_SignatureType sig_t
{
int ret;
ecc_key eccKey;
RNG rng;
WC_RNG rng;
byte* sigBuf = NULL;
word32 sigLen;
byte eccPubKeyBuf[ECC_BUFSIZE], eccPrivKeyBuf[ECC_BUFSIZE];
@ -202,7 +202,7 @@ int rsa_sign_verify_test(enum wc_HashType hash_type, enum wc_SignatureType sig_t
{
int ret;
RsaKey rsaKey;
RNG rng;
WC_RNG rng;
byte *sigBuf = NULL;
word32 sigLen;
#ifdef WOLFSSL_KEY_GEN

View File

@ -12,15 +12,15 @@ all:wolfsigtest opensigtest eccsiglentest
opensigtest:CFLAGS+=$(OPENSSL_FLAGS)
opensigtest:opensigtest.o
$(CC) -o $@ $(LIBS) $(OPENSSL_LIB) $^ $(CFLAGS)
$(CC) -o $@ $(LIBS) $^ $(CFLAGS) $(OPENSSL_LIB)
wolfsigtest:CFLAGS+=$(WOLFSSL_FLAGS)
wolfsigtest:wolfsigtest.o
$(CC) -o $@ $(LIBS) $(WOLFSSL_LIB) $^ $(CFLAGS)
$(CC) -o $@ $(LIBS) $^ $(CFLAGS) $(WOLFSSL_LIB)
eccsiglentest:CFLAGS+=$(WOLFSSL_FLAGS)
eccsiglentest:eccsiglentest.o
$(CC) -o $@ $(LIBS) $(WOLFSSL_LIB) $^ $(CFLAGS)
$(CC) -o $@ $(LIBS) $^ $(CFLAGS) $(WOLFSSL_LIB)
.PHONY: clean all

View File

@ -8,7 +8,7 @@
#include <wolfssl/wolfcrypt/logging.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/wolfcrypt/asn.h>
#include "wolfssl/wolfcrypt/rsa.h"
#include <wolfssl/wolfcrypt/rsa.h>
/* Set this define to show RSA verify only */
//#define DEMO_RSA_VERIFY_ONLY
@ -75,13 +75,13 @@ const char* privPemKey = "-----BEGIN RSA PRIVATE KEY-----\n"
"R3dAd0UYng3OeT9XMVYJSWe+lFhP9sSr4onj44rABVUsJMBKlwQnmg==\n"
"-----END RSA PRIVATE KEY-----\n";
uint8_t Digest_given[] = { /* 44 bytes */
byte Digest_given[] = { /* 44 bytes */
0x2C,0x05,0x16,0x39,0x9F,0x0C,0x02,0xD0,0xf9,0xba,0x90,0x37,0x0f,0xc1,0x4f,0xcc,
0x31,0x4b,0x42,0x32,0x00,0x00,0x36,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x49,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x21,0x00,0x3f,0x19
};
uint8_t expected_signed_results[] = {
byte expected_signed_results[] = {
0x15,0xEB,0xE3,0x5A,0xA7,0x82,0x97,0x7C,0x3E,0x6D,0x3E,0x30,0xFB,0x3D,0x01,0x2C,
0x71,0x3A,0x47,0x84,0x2B,0xB4,0x99,0x35,0xA3,0x2E,0x91,0xE4,0xF0,0x77,0x29,0x8A,
0x63,0x51,0x33,0xB0,0x4F,0xBE,0x92,0xDB,0x17,0x3B,0xD6,0x3E,0x45,0x06,0x4E,0xAB,
@ -104,7 +104,7 @@ uint8_t expected_signed_results[] = {
#define DATA_BLOCK_LEN 44
#define SIGNED_LEN 256
static void print_buf(char *str, uint8_t *buf, int blen)
static void print_buf(char *str, byte *buf, int blen)
{
int i, j;