Skip to content

Commit 2326995

Browse files
SparkiDevSparkiDev
authored
Merge pull request #435 from bandi13/ConsolidateNaming
Several fixes in various tests across the repository
2 parents d9fcb0e + 21b7c8e commit 2326995

88 files changed

Lines changed: 344 additions & 264 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎X9.146/Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ CC=gcc
22
#if you installed wolfssl to an alternate location use CFLAGS and LIBS to
33
#control your build:
44

5-
#EXAMPLE: set WOLF_INSTALL_DIR to point to your install location like so:
6-
# WOLF_INSTALL_DIR=/Users/username/work/testDir/wolf-install-dir-for-testing
5+
#EXAMPLE: set WOLFSSL_INSTALL_DIR to point to your install location like so:
6+
# WOLFSSL_INSTALL_DIR=/Users/username/work/testDir/wolf-install-dir-for-testing
77
#END EXAMPLE
88

9-
WOLF_INSTALL_DIR=/usr/local
9+
WOLFSSL_INSTALL_DIR=/usr/local
1010

1111
# ECC Examples Makefile
1212
CC = gcc
13-
LIB_PATH = /usr/local
14-
CFLAGS = -Wall -I$(LIB_PATH)/include
15-
LIBS = -L$(LIB_PATH)/lib -lm
13+
WOLFSSL_INSTALL_DIR = /usr/local
14+
CFLAGS = -Wall -I$(WOLFSSL_INSTALL_DIR)/include
15+
LIBS = -L$(WOLFSSL_INSTALL_DIR)/lib -lm
1616

1717
# option variables
1818
DYN_LIB = -lwolfssl
19-
STATIC_LIB = $(LIB_PATH)/lib/libwolfssl.a
19+
STATIC_LIB = $(WOLFSSL_INSTALL_DIR)/lib/libwolfssl.a
2020
DEBUG_FLAGS = -g -DDEBUG
2121
DEBUG_INC_PATHS = -MD
2222
OPTIMIZE = -Os

‎btle/ecies/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# BTLE Examples Makefile
22
CC = gcc
3-
LIB_PATH = /usr/local
4-
CFLAGS = -Wall -I ../common -I$(LIB_PATH)/include
5-
LIBS = -L$(LIB_PATH)/lib
3+
WOLFSSL_INSTALL_DIR = /usr/local
4+
CFLAGS = -Wall -I ../common -I$(WOLFSSL_INSTALL_DIR)/include
5+
LIBS = -L$(WOLFSSL_INSTALL_DIR)/lib
66

77
# Flags
88
DYN_LIB = -lwolfssl
@@ -15,7 +15,7 @@ OPTIMIZE = -Os
1515
#CFLAGS+=$(OPTIMIZE)
1616

1717
# Static or Dynamic Library
18-
#STATIC_LIB+=$(LIB_PATH)/lib/libwolfssl.a
18+
#STATIC_LIB+=$(WOLFSSL_INSTALL_DIR)/lib/libwolfssl.a
1919
LIBS+=$(DYN_LIB) -lm
2020

2121

‎btle/tls/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# BTLE Examples Makefile
22
CC = gcc
3-
LIB_PATH = /usr/local
4-
CFLAGS = -Wall -I ../common -I $(LIB_PATH)/include
5-
LIBS = -L$(LIB_PATH)/lib
3+
WOLFSSL_INSTALL_DIR = /usr/local
4+
CFLAGS = -Wall -I ../common -I $(WOLFSSL_INSTALL_DIR)/include
5+
LIBS = -L$(WOLFSSL_INSTALL_DIR)/lib
66

77
# Flags
88
DYN_LIB = -lwolfssl
@@ -15,7 +15,7 @@ OPTIMIZE = -Os
1515
CFLAGS+=$(OPTIMIZE)
1616

1717
# Static or Dynamic Library
18-
#STATIC_LIB+=$(LIB_PATH)/lib/libwolfssl.a
18+
#STATIC_LIB+=$(WOLFSSL_INSTALL_DIR)/lib/libwolfssl.a
1919
LIBS+=$(DYN_LIB) -lm
2020

2121

‎caam/seco/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# SECO Examples Makefile
2-
WOLFSSL_PATH ?= /usr/local
2+
WOLFSSL_INSTALL_DIR ?= /usr/local
33
CRYPTODEV_DIR ?= /usr/include
44
ZLIB_DIR ?= /usr
5-
CFLAGS = -O -Wall -I$(WOLFSSL_PATH)/include -I$(HSM_DIR)/include -I$(CRYPTODEV_DIR)
6-
LIBS = -L$(WOLFSSL_PATH)/lib -L$(ZLIB_DIR)/lib -lm -lz -lpthread
5+
CFLAGS = -O -Wall -I$(WOLFSSL_INSTALL_DIR)/include -I$(HSM_DIR)/include -I$(CRYPTODEV_DIR)
6+
LIBS = -L$(WOLFSSL_INSTALL_DIR)/lib -L$(ZLIB_DIR)/lib -lm -lz -lpthread
77

88
# option variables
99
DYN_LIB = -lwolfssl
10-
STATIC_LIB = $(WOLFSSL_PATH)/lib/libwolfssl.a
10+
STATIC_LIB = $(WOLFSSL_INSTALL_DIR)/lib/libwolfssl.a
1111

1212
# build targets
1313
SRC=$(wildcard *.c)

‎caam/seco/cryptodev/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# SECO Examples Makefile
2-
WOLFSSL_PATH ?= /usr/local
2+
WOLFSSL_INSTALL_DIR ?= /usr/local
33
CRYPTODEV_DIR ?= /usr/include
44
ZLIB_DIR ?= /usr
5-
CFLAGS = -O -Wall -I$(WOLFSSL_PATH)/include -I$(HSM_DIR)/include -I$(CRYPTODEV_DIR)
6-
LIBS = -L$(WOLFSSL_PATH)/lib -L$(ZLIB_DIR)/lib -lm -lz -lpthread
5+
CFLAGS = -O -Wall -I$(WOLFSSL_INSTALL_DIR)/include -I$(HSM_DIR)/include -I$(CRYPTODEV_DIR)
6+
LIBS = -L$(WOLFSSL_INSTALL_DIR)/lib -L$(ZLIB_DIR)/lib -lm -lz -lpthread
77

88
# option variables
99
DYN_LIB = -lwolfssl
10-
STATIC_LIB = $(WOLFSSL_PATH)/lib/libwolfssl.a
10+
STATIC_LIB = $(WOLFSSL_INSTALL_DIR)/lib/libwolfssl.a
1111

1212
# build targets
1313
SRC=$(wildcard *.c)

‎certfields/all-fields/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CC=gcc
2-
WOLFPATH=/usr/local
2+
WOLFSSL_INSTALL_DIR=/usr/local
33

4-
CFLAGS=-I$(WOLFPATH)/include -Wall
5-
LIBS=-L$(WOLFPATH)/lib -lwolfssl
4+
CFLAGS=-I$(WOLFSSL_INSTALL_DIR)/include -Wall
5+
LIBS=-L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl
66

77
app: main.o
88
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)

‎certfields/extendedKeyUsage/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CC=gcc -fsanitize=address
2-
WOLFSSL_DIR=/usr/local
3-
CFLAGS=-Wall -I$(WOLFSSL_DIR)/include
4-
LIBS= -L$(WOLFSSL_DIR)/lib -lwolfssl
2+
WOLFSSL_INSTALL_DIR=/usr/local
3+
CFLAGS=-Wall -I$(WOLFSSL_INSTALL_DIR)/include
4+
LIBS= -L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl
55

66
run: test.o
77
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)

‎certfields/extendedKeyUsage/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ wolfSSL Library must be configured with --enable-opensslextra
55
wolfSSL lib installed to /usr/local
66

77
NOTE: If wolfSSL is installed to custom directory edit Makefile variable
8-
WOLFSSL_DIR accordingly for example if you configured wolfSSL with
9-
"--enable-prefix=/home/me/wolf-install-dir" then set WOLFSSL_DIR to
8+
WOLFSSL_INSTALL_DIR accordingly for example if you configured wolfSSL with
9+
"--enable-prefix=/home/me/wolf-install-dir" then set WOLFSSL_INSTALL_DIR to
1010
"/home/me/wolf-install-dir" before running "make"
1111

1212
Building:

‎certfields/extract-pubkey-from-certfile/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CC=gcc
22

3-
WOLFPATH=/usr/local
4-
CFLAGS= -I$(WOLFPATH)/include -Wall
5-
LIBS= -L$(WOLFPATH)/lib -lwolfssl
3+
WOLFSSL_INSTALL_DIR=/usr/local
4+
CFLAGS= -I$(WOLFSSL_INSTALL_DIR)/include -Wall
5+
LIBS= -L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl
66

77
app: main.o
88
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)

‎certfields/keyUsage/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CC=gcc
2-
WOLFSSL_DIR=/usr/local
3-
CFLAGS=-Wall -I$(WOLFSSL_DIR)/include
4-
LIBS= -L$(WOLFSSL_DIR)/lib -lwolfssl
2+
WOLFSSL_INSTALL_DIR=/usr/local
3+
CFLAGS=-Wall -I$(WOLFSSL_INSTALL_DIR)/include
4+
LIBS= -L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl
55

66
run: test.o
77
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)

0 commit comments

Comments
 (0)