Revert "Revert "Revert "Initial commit of BRSKI pledge support"""

This reverts commit 6a13b69.

"Get revert corrected"

Makefile.am

@@ -1,9 +1,4 @@
 ACLOCAL_AMFLAGS = -I m4
 
-if ENABLE_CLIENT_ONLY 
-SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/client-brski
-else 
-SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/server example/proxy example/client-brski
-endif
-
-EXTRA_DIST = autogen.sh example/util LICENSE README.brski $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle
+SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/server example/proxy
+EXTRA_DIST = autogen.sh example/util LICENSE  $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle

Makefile.in

@@ -157,9 +157,7 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
-DIST_SUBDIRS = safe_c_stub src java/jni example/client \
-	example/client-simple example/server example/proxy \
-	example/client-brski
+DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.in \
 	$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
 	$(top_srcdir)/config/config.sub \
@@ -334,9 +332,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
-@ENABLE_CLIENT_ONLY_FALSE@SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/server example/proxy example/client-brski
-@ENABLE_CLIENT_ONLY_TRUE@SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/client-brski
-EXTRA_DIST = autogen.sh example/util LICENSE README.brski $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle
+SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/server example/proxy
+EXTRA_DIST = autogen.sh example/util LICENSE  $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle
 all: all-recursive
 
 .SUFFIXES:

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libest 2.1.0p.brski.
+# Generated by GNU Autoconf 2.69 for libest 2.1.0p.
 #
 # Report bugs to <libest-dev>.
 #
@@ -589,15 +589,14 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libest'
 PACKAGE_TARNAME='libest'
-PACKAGE_VERSION='2.1.0p.brski'
-PACKAGE_STRING='libest 2.1.0p.brski'
+PACKAGE_VERSION='2.1.0p'
+PACKAGE_STRING='libest 2.1.0p'
 PACKAGE_BUGREPORT='libest-dev'
 PACKAGE_URL=''
 
 ac_unique_file="src/est/est.c"
 ac_unique_file="example/client/estclient.c"
 ac_unique_file="example/client-simple/estclient-simple.c"
-ac_unique_file="example/client-brski/estclient-brski.c"
 ac_unique_file="example/server/estserver.c"
 ac_unique_file="example/proxy/estproxy.c"
 # Factoring default headers for most tests.
@@ -649,10 +648,6 @@ SSL_LDFLAGS
 SSL_CFLAGS
 DISABLE_PTHREAD_FALSE
 DISABLE_PTHREAD_TRUE
-ENABLE_BRSKI_FALSE
-ENABLE_BRSKI_TRUE
-ENABLE_CLIENT_ONLY_FALSE
-ENABLE_CLIENT_ONLY_TRUE
 JAVA_HOME_SET_FALSE
 JAVA_HOME_SET_TRUE
 ENABLE_JNI_FALSE
@@ -791,8 +786,6 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_jni
-enable_client_only
-enable_brski
 enable_pthreads
 with_ssl_dir
 with_libcurl_dir
@@ -1358,7 +1351,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libest 2.1.0p.brski to adapt to many kinds of systems.
+\`configure' configures libest 2.1.0p to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1429,7 +1422,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libest 2.1.0p.brski:";;
+     short | recursive ) echo "Configuration of libest 2.1.0p:";;
    esac
   cat <<\_ACEOF
 
@@ -1452,9 +1445,6 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-jni            Enable support for JNI library
-  --enable-client-only    Enable the building of only the client mode of
-                          libEST
-  --enable-brski          Enable support for brski bootstrap functionality
   --disable-pthreads      Disable support for pthreads
 
 Optional Packages:
@@ -1551,7 +1541,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libest configure 2.1.0p.brski
+libest configure 2.1.0p
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1829,7 +1819,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libest $as_me 2.1.0p.brski, which was
+It was created by libest $as_me 2.1.0p, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2213,7 +2203,6 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-
 am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
@@ -2700,7 +2689,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libest'
- VERSION='2.1.0p.brski'
+ VERSION='2.1.0p'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2838,7 +2827,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libest'
- VERSION='2.1.0p.brski'
+ VERSION='2.1.0p'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12251,8 +12240,6 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-
-
 # Check whether --enable-jni was given.
 if test "${enable_jni+set}" = set; then :
   enableval=$enable_jni; jni_on=1
@@ -12286,55 +12273,6 @@ else
 fi
 
 
-# Check whether --enable-client-only was given.
-if test "${enable_client_only+set}" = set; then :
-  enableval=$enable_client_only; clientonly_on=1
-else
-  clientonly_on=0
-fi
-
- if test x$clientonly_on = x1; then
-  ENABLE_CLIENT_ONLY_TRUE=
-  ENABLE_CLIENT_ONLY_FALSE='#'
-else
-  ENABLE_CLIENT_ONLY_TRUE='#'
-  ENABLE_CLIENT_ONLY_FALSE=
-fi
-
-if test -z "$ENABLE_CLIENT_ONLY_TRUE"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Client only build enabled" >&5
-$as_echo "Client only build enabled" >&6; }
-	   $as_echo "#define ENABLE_CLIENT_ONLY 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Client Only support is disabled" >&5
-$as_echo "Client Only support is disabled" >&6; }
-fi
-
-# Check whether --enable-brski was given.
-if test "${enable_brski+set}" = set; then :
-  enableval=$enable_brski; brski_on=1
-else
-  brski_on=0
-fi
-
- if test x$brski_on = x1; then
-  ENABLE_BRSKI_TRUE=
-  ENABLE_BRSKI_FALSE='#'
-else
-  ENABLE_BRSKI_TRUE='#'
-  ENABLE_BRSKI_FALSE=
-fi
-
-if test -z "$ENABLE_BRSKI_TRUE"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: BRSKI support enabled" >&5
-$as_echo "BRSKI support enabled" >&6; }
-	   $as_echo "#define ENABLE_BRSKI 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: BRSKI support is disabled" >&5
-$as_echo "BRSKI support is disabled" >&6; }
-fi
 
 # Check whether --enable-pthreads was given.
 if test "${enable_pthreads+set}" = set; then :
@@ -12740,7 +12678,7 @@ LIBS="$LIBS -lsafe_lib"
 
 cp confdefs.h est_config.h
 
-ac_config_files="$ac_config_files Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile java/jni/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile example/server/Makefile example/proxy/Makefile"
+ac_config_files="$ac_config_files Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile java/jni/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/server/Makefile example/proxy/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -12939,14 +12877,6 @@ if test -z "${JAVA_HOME_SET_TRUE}" && test -z "${JAVA_HOME_SET_FALSE}"; then
   as_fn_error $? "conditional \"JAVA_HOME_SET\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_CLIENT_ONLY_TRUE}" && test -z "${ENABLE_CLIENT_ONLY_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_CLIENT_ONLY\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_BRSKI_TRUE}" && test -z "${ENABLE_BRSKI_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_BRSKI\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DISABLE_PTHREAD_TRUE}" && test -z "${DISABLE_PTHREAD_FALSE}"; then
   as_fn_error $? "conditional \"DISABLE_PTHREAD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -13348,7 +13278,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libest $as_me 2.1.0p.brski, which was
+This file was extended by libest $as_me 2.1.0p, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13405,7 +13335,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libest config.status 2.1.0p.brski
+libest config.status 2.1.0p
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -13817,7 +13747,6 @@ do
     "src/est/Makefile") CONFIG_FILES="$CONFIG_FILES src/est/Makefile" ;;
     "example/client/Makefile") CONFIG_FILES="$CONFIG_FILES example/client/Makefile" ;;
     "example/client-simple/Makefile") CONFIG_FILES="$CONFIG_FILES example/client-simple/Makefile" ;;
-    "example/client-brski/Makefile") CONFIG_FILES="$CONFIG_FILES example/client-brski/Makefile" ;;
     "example/server/Makefile") CONFIG_FILES="$CONFIG_FILES example/server/Makefile" ;;
     "example/proxy/Makefile") CONFIG_FILES="$CONFIG_FILES example/proxy/Makefile" ;;
 

configure.ac

@@ -1,10 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([libest],[2.1.0p.brski],[libest-dev])
+AC_INIT([libest],[2.1.0p],[libest-dev])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(src/est/est.c)
 AC_CONFIG_SRCDIR(example/client/estclient.c)
 AC_CONFIG_SRCDIR(example/client-simple/estclient-simple.c)
-AC_CONFIG_SRCDIR(example/client-brski/estclient-brski.c)
 AC_CONFIG_SRCDIR(example/server/estserver.c)
 AC_CONFIG_SRCDIR(example/proxy/estproxy.c)
 AC_CONFIG_MACRO_DIR([m4])
@@ -30,8 +29,6 @@ AM_COND_IF([FREEBSD], AC_MSG_RESULT([FreeBSD is set]), AC_MSG_RESULT([FreeBSD no
 AM_COND_IF([FREEBSD], AC_MSG_RESULT([Skipping libdl check]),
 		    AC_CHECK_LIB([dl], [dlopen], [],
 				[AC_MSG_FAILURE([can't find libdl])]))
-
-
 AC_ARG_ENABLE([jni], 
 	       [AS_HELP_STRING([--enable-jni],
 			       [Enable support for JNI library])],
@@ -44,27 +41,6 @@ AM_COND_IF([ENABLE_JNI],
 	   AC_MSG_RESULT([JNI support is disabled]))
 AM_CONDITIONAL([JAVA_HOME_SET], [test ! -z "$JAVA_HOME"]) 
 
-AC_ARG_ENABLE([client-only], 
-	       [AS_HELP_STRING([--enable-client-only],
-			       [Enable the building of only the client mode of libEST])],
-		[clientonly_on=1],
-		[clientonly_on=0])
-AM_CONDITIONAL([ENABLE_CLIENT_ONLY], [test x$clientonly_on = x1])
-AM_COND_IF([ENABLE_CLIENT_ONLY], 
-	   AC_MSG_RESULT([Client only build enabled])
-	   AC_DEFINE([ENABLE_CLIENT_ONLY]),
-	   AC_MSG_RESULT([Client Only support is disabled]))
-
-AC_ARG_ENABLE([brski], 
-	       [AS_HELP_STRING([--enable-brski],
-			       [Enable support for brski bootstrap functionality])],
-		[brski_on=1],
-		[brski_on=0])
-AM_CONDITIONAL([ENABLE_BRSKI], [test x$brski_on = x1])
-AM_COND_IF([ENABLE_BRSKI], 
-	   AC_MSG_RESULT([BRSKI support enabled])
-	   AC_DEFINE([ENABLE_BRSKI]),
-	   AC_MSG_RESULT([BRSKI support is disabled]))
 
 AC_ARG_ENABLE([pthreads], 
 	       [AS_HELP_STRING([--disable-pthreads],
@@ -167,5 +143,5 @@ AC_PREFIX_DEFAULT([/usr/local/est])
 
 cp confdefs.h est_config.h
 
-AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile java/jni/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile example/server/Makefile example/proxy/Makefile])
+AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile java/jni/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/server/Makefile example/proxy/Makefile])
 AC_OUTPUT