Skip to content

Commit 88d02e8

Browse files
author
smcmahonibm
committed
bin2hex was already there
Signed-off-by: smcmahonibm <[email protected]>
1 parent b150a01 commit 88d02e8

File tree

3 files changed

+5
-35
lines changed

3 files changed

+5
-35
lines changed

bin2hex.pl

Lines changed: 0 additions & 34 deletions
This file was deleted.

icc/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ create_openssl: ../openssl_source/$(OPENSSL_VER)-icc.tar.gz
167167
rm -r $(OPENSSL_VER) openssl ; \
168168
rm -rf x; mkdir x; cd x; \
169169
tar xzf ../openssl_source/$(OPENSSL_VER)-icc.tar.gz ; \
170+
sleep 1; \
170171
mv openssl ../$(OPENSSL_VER) ; \
171172
chmod +x ../$(OPENSSL_VER)/Configure ; \
172173
cd ..; \
@@ -597,7 +598,7 @@ privkey.rsa:
597598
pubkey.h: privkey.rsa
598599
$(OPENSSL_PATH_SETUP) $(MYOPENSSL) rsa -in privkey.rsa -outform DER -RSAPublicKey_out > rsa_pub_key.der
599600
echo "/*This is an auto generated code please DO NOT modify*/" > pubkey.h
600-
perl $(ICC_ROOT)/bin2hex.pl rsa_pub_key.der temp.h
601+
perl $(ICC_ROOT)/icc/bin2hex.pl rsa_pub_key.der temp.h
601602
cat temp.h >> pubkey.h
602603
echo pubkey.h
603604
cat pubkey.h

icc/platforms/1.1.1/WIN_like.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ icc.res: icc.rc
1111
$(MYOPENSSL): openssl.exe
1212
$(CP) openssl.exe $@
1313

14+
../$(OPENSSL_VER)/apps/openssl$(OBJSUFX): ../$(OPENSSL_VER)/apps/openssl.c
15+
$(BUILD_OSSL)
16+
1417
openssl$(OBJSUFX): $(OSSL_DIR)/apps/openssl$(OBJSUFX)
1518
cp $(OSSL_DIR)/apps/openssl$(OBJSUFX) $@
1619

0 commit comments

Comments
 (0)