Replace OpenSSL base64 impl with a simple direct impl.
Unit tests, too.
This commit is contained in:
+12
-2
@@ -16,12 +16,16 @@ displaytests = \
|
||||
unicode-combine-fallback-assert.test \
|
||||
unicode-later-combining.test
|
||||
|
||||
check_PROGRAMS = ocb-aes encrypt-decrypt
|
||||
TESTS = ocb-aes encrypt-decrypt $(displaytests)
|
||||
check_PROGRAMS = ocb-aes encrypt-decrypt base64
|
||||
TESTS = ocb-aes encrypt-decrypt base64 $(displaytests)
|
||||
XFAIL_TESTS = \
|
||||
e2e-failure.test \
|
||||
emulation-back-tab.test
|
||||
|
||||
base64_vector.cc: $(srcdir)/genbase64.pl
|
||||
$(AM_V_GEN)echo '#include "base64_vector.h"' > base64_vector.cc || rm base64_vector.cc
|
||||
$(AM_V_GEN)perl $(srcdir)/genbase64.pl >> base64_vector.cc || rm base64_vector.cc
|
||||
|
||||
ocb_aes_SOURCES = ocb-aes.cc test_utils.cc test_utils.h
|
||||
ocb_aes_CPPFLAGS = -I$(srcdir)/../crypto -I$(srcdir)/../util
|
||||
ocb_aes_LDADD = ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(OPENSSL_LIBS)
|
||||
@@ -30,7 +34,13 @@ encrypt_decrypt_SOURCES = encrypt-decrypt.cc test_utils.cc test_utils.h
|
||||
encrypt_decrypt_CPPFLAGS = -I$(srcdir)/../crypto -I$(srcdir)/../util
|
||||
encrypt_decrypt_LDADD = ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(OPENSSL_LIBS)
|
||||
|
||||
base64_SOURCES = base64.cc base64_vector.cc base64_vector.h genbase64.pl
|
||||
base64_CPPFLAGS = $(ocb_aes_CPPFLAGS)
|
||||
base64_LDADD = $(ocb_aes_LDADD)
|
||||
|
||||
clean-local: clean-local-check
|
||||
.PHONY: clean-local-check
|
||||
clean-local-check:
|
||||
-for i in $(displaytests); do rm -rf $$i.d/; done
|
||||
|
||||
CLEANFILES = base64_vector.cc
|
||||
|
||||
Reference in New Issue
Block a user