diff options
| author | Rob Austein <sra@hactrn.net> | 2016-05-25 22:44:42 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-05-25 22:44:42 -0400 |
| commit | 079d5ffc207fc2609b9293f9efe4781bed493ee0 (patch) | |
| tree | c3a0903fd984840727cc2fd7886f45b183fa475d /GNUmakefile | |
| parent | dbd082f37ae7067c86982f153d2f555d9c21c340 (diff) | |
Track PIN changes on libhal master branch.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index dc41be5..212409a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -96,7 +96,7 @@ attributes.h: attributes.yaml scripts/build-attributes GNUmakefile py11/attribute_map.py: attributes.yaml scripts/build-py11-attributes GNUmakefile python scripts/build-py11-attributes attributes.yaml py11/attribute_map.py -pkcs11.o: pkcs11.c p11_common.h schema.h attributes.h +pkcs11.o: pkcs11.c schema.h attributes.h ${CC} ${CFLAGS} -c $< pkcs11.so: pkcs11.o ${LIBS} @@ -105,7 +105,7 @@ pkcs11.so: pkcs11.o ${LIBS} libpkcs11.so: pkcs11.so ${OBJCOPY} -w -G 'C_*' $< $@ -p11util.o: p11util.c p11_common.h schema.h +p11util.o: p11util.c schema.h ${CC} ${CFLAGS} -c $< p11util: p11util.o ${LIBS} @@ -145,11 +145,13 @@ ifneq "${HSMBULLY}" "" sudo CRYPTECH_KEYSTORE=${HSMBULLY_KS_SERVER} ${HSMBULLY_SERVER_BIN} & \ pid=$$!; \ sleep 5; \ - (echo fnord; echo fnord) | CRYPTECH_KEYSTORE=${HSMBULLY_KS_CLIENT} ./p11util --set-so-pin --set-user-pin --pin-from-stdin; \ + (echo YouReallyNeedToChangeThisPINRightNowWeAreNotKidding; echo fnord; echo fnord) | \ + CRYPTECH_KEYSTORE=${HSMBULLY_KS_CLIENT} ./p11util --set-so-pin --set-user-pin --pin-from-stdin; \ PKCS11_DATABASE=${HSMBULLY_DATABASE} CRYPTECH_KEYSTORE=${HSMBULLY_KS_CLIENT} ${HSMBULLY} ${HSMBULLY_OPTIONS}; \ sudo kill $$pid; \ else \ - (echo fnord; echo fnord) | sudo CRYPTECH_KEYSTORE=${HSMBULLY_KS_CLIENT} ./p11util --set-so-pin --set-user-pin --pin-from-stdin; \ + (echo YouReallyNeedToChangeThisPINRightNowWeAreNotKidding; echo fnord; echo fnord) | \ + sudo CRYPTECH_KEYSTORE=${HSMBULLY_KS_CLIENT} ./p11util --set-so-pin --set-user-pin --pin-from-stdin; \ sudo PKCS11_DATABASE=${HSMBULLY_DATABASE} CRYPTECH_KEYSTORE=${HSMBULLY_KS_CLIENT} ${HSMBULLY} ${HSMBULLY_OPTIONS}; \ fi; \ sudo rm -f ${HSMBULLY_DATABASE} ${HSMBULLY_DATABASE}-journal ${HSMBULLY_KS_CLIENT} ${HSMBULLY_KS_SERVER} |