From fa6bbf1d327f6d2e79bb4b95064e14dd301d5bbe Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sun, 21 Nov 2010 10:09:42 +0000 Subject: [PATCH] roken: Add base64 functions to libroken Install the base64.h header, and add the base64_encode and base64_decode functions to the library Change-Id: If0ed8fb13cecb6f4a48b4208fbef8c800a5284d5 Reviewed-on: http://gerrit.openafs.org/3354 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/roken/Makefile.in | 10 +++++++++- src/roken/NTMakefile | 4 +++- src/roken/afsroken.def | 2 ++ src/roken/librokenafs.map | 2 ++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/roken/Makefile.in b/src/roken/Makefile.in index b7db251..7c22a31 100644 --- a/src/roken/Makefile.in +++ b/src/roken/Makefile.in @@ -10,7 +10,8 @@ include @TOP_OBJDIR@/src/config/Makefile.shared INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -HEADERS = ${TOP_INCDIR}/roken.h \ +HEADERS = ${TOP_INCDIR}/base64.h \ + ${TOP_INCDIR}/roken.h \ ${TOP_INCDIR}/roken-common.h UPSTREAM = $(TOP_SRCDIR)/external/heimdal/roken @@ -35,6 +36,7 @@ clean: $(RM) -f $(OBJECTS) $(SHLIBOBJ) librokenafs.a librokenafs.exp OBJECTS = $(ROKEN_LIBOBJS) \ + base64.o \ cloexec.o ct.o hex.o issuid.o net_read.o net_write.o socket.o \ snprintf.o warnerr.o @@ -55,6 +57,9 @@ librokenafs.a: $(OBJECTS) $(AR) crv $@ $(OBJECTS) $(RANLIB) $@ +$(TOP_INCDIR)/base64.h: ${UPSTREAM}/base64.h + $(INSTALL_DATA) $? $@ + $(TOP_INCDIR)/err.h: ${UPSTREAM}/err.hin cp $? $@ @@ -67,6 +72,9 @@ $(TOP_INCDIR)/roken-common.h: $(UPSTREAM)/roken-common.h err.h: ${UPSTREAM}/err.hin cp $? $@ +base64.o: $(UPSTREAM)/base64.c + $(AFS_CCRULE) $(UPSTREAM)/base64.c + cloexec.o: ${UPSTREAM}/cloexec.c $(AFS_CCRULE) $(UPSTREAM)/cloexec.c diff --git a/src/roken/NTMakefile b/src/roken/NTMakefile index adea2dc..5886b79 100644 --- a/src/roken/NTMakefile +++ b/src/roken/NTMakefile @@ -18,11 +18,13 @@ INCFILES = \ $(INCFILEDIR)\roken.h ROKEN_INCFILES = \ - $(INCFILEDIR)\roken-common.h + $(INCFILEDIR)\roken-common.h \ + $(INCFILEDIR)\base64.h LIBFILE = $(DESTDIR)\lib\afsroken.dll ROKEN_OBJS = \ + $(OUT)\base64.obj \ $(OUT)\cloexec.obj \ $(OUT)\ct.obj \ $(OUT)\ecalloc.obj \ diff --git a/src/roken/afsroken.def b/src/roken/afsroken.def index 689556c..4b000ea 100644 --- a/src/roken/afsroken.def +++ b/src/roken/afsroken.def @@ -24,3 +24,5 @@ EXPORTS vwarnx @28 warn @29 warnx @30 + base64_decode @31 + base64_encode @32 diff --git a/src/roken/librokenafs.map b/src/roken/librokenafs.map index 11bca46..340529e 100644 --- a/src/roken/librokenafs.map +++ b/src/roken/librokenafs.map @@ -1,5 +1,7 @@ { global: + base64_decode; + base64_encode; ct_memcmp; daemon; err; -- 1.9.4