From 3080d13cb55902e55869b611520443512bbc788c Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 13 Jul 2007 17:28:35 +0000
Subject: [PATCH] Create crypto plugin for use with OpenSSL for now, GNU tool
later.
---
Makefile.in | 1 +
NEWS | 5 +-
RELEASE_NOTES | 2 +
auxdir/Makefile.in | 1 +
auxdir/x_ac_slurm_ssl.m4 | 6 +-
configure | 79 ++-
configure.ac | 5 +-
doc/Makefile.in | 1 +
doc/html/Makefile.in | 1 +
doc/html/configurator.html.in | 10 +-
doc/man/Makefile.in | 1 +
doc/man/man5/slurm.conf.5 | 11 +-
slurm.spec | 2 +
slurm/slurm.h.in | 1 +
slurm/slurm_errno.h | 1 +
src/Makefile.in | 1 +
src/api/Makefile.in | 1 +
src/api/config_info.c | 2 +
src/common/Makefile.in | 1 +
src/common/read_config.c | 6 +
src/common/read_config.h | 1 +
src/common/slurm_cred.c | 472 +++++++++------
src/common/slurm_cred.h | 3 +
src/common/slurm_errno.c | 2 +
src/common/slurm_protocol_api.c | 15 +
src/common/slurm_protocol_api.h | 6 +
src/common/slurm_protocol_defs.c | 1 +
src/common/slurm_protocol_pack.c | 4 +
src/plugins/Makefile.am | 2 +-
src/plugins/Makefile.in | 3 +-
src/plugins/auth/Makefile.in | 1 +
src/plugins/auth/authd/Makefile.in | 1 +
src/plugins/auth/munge/Makefile.in | 1 +
src/plugins/auth/none/Makefile.in | 1 +
src/plugins/checkpoint/Makefile.in | 1 +
src/plugins/checkpoint/aix/Makefile.in | 1 +
src/plugins/checkpoint/none/Makefile.in | 1 +
src/plugins/crypto/Makefile.am | 3 +
src/plugins/crypto/Makefile.in | 558 +++++++++++++++++
src/plugins/crypto/openssl/Makefile.am | 32 +
src/plugins/crypto/openssl/Makefile.in | 565 ++++++++++++++++++
src/plugins/crypto/openssl/crypto_openssl.c | 228 +++++++
src/plugins/database/Makefile.in | 1 +
src/plugins/database/flatfile/Makefile.in | 1 +
src/plugins/database/mysql/Makefile.in | 1 +
src/plugins/database/pgsql/Makefile.in | 1 +
src/plugins/jobacct/Makefile.in | 1 +
src/plugins/jobacct/aix/Makefile.in | 1 +
src/plugins/jobacct/linux/Makefile.in | 1 +
src/plugins/jobacct/none/Makefile.in | 1 +
src/plugins/jobcomp/Makefile.in | 1 +
src/plugins/jobcomp/database/Makefile.in | 1 +
src/plugins/jobcomp/filetxt/Makefile.in | 1 +
src/plugins/jobcomp/none/Makefile.in | 1 +
src/plugins/jobcomp/script/Makefile.in | 1 +
src/plugins/mpi/Makefile.in | 1 +
src/plugins/mpi/lam/Makefile.in | 1 +
src/plugins/mpi/mpich1_p4/Makefile.in | 1 +
src/plugins/mpi/mpich1_shmem/Makefile.in | 1 +
src/plugins/mpi/mpichgm/Makefile.in | 1 +
src/plugins/mpi/mvapich/Makefile.in | 1 +
src/plugins/mpi/none/Makefile.in | 1 +
src/plugins/mpi/openmpi/Makefile.in | 1 +
src/plugins/proctrack/Makefile.in | 1 +
src/plugins/proctrack/aix/Makefile.in | 1 +
src/plugins/proctrack/linuxproc/Makefile.in | 1 +
src/plugins/proctrack/pgid/Makefile.in | 1 +
src/plugins/proctrack/rms/Makefile.in | 1 +
src/plugins/proctrack/sgi_job/Makefile.in | 1 +
src/plugins/sched/Makefile.in | 1 +
src/plugins/sched/backfill/Makefile.in | 1 +
src/plugins/sched/builtin/Makefile.in | 1 +
src/plugins/sched/gang/Makefile.in | 1 +
src/plugins/sched/hold/Makefile.in | 1 +
src/plugins/sched/wiki/Makefile.in | 1 +
src/plugins/sched/wiki2/Makefile.in | 1 +
src/plugins/select/Makefile.in | 1 +
src/plugins/select/bluegene/Makefile.in | 1 +
.../bluegene/block_allocator/Makefile.in | 1 +
.../select/bluegene/plugin/Makefile.in | 1 +
src/plugins/select/cons_res/Makefile.in | 1 +
src/plugins/select/linear/Makefile.in | 1 +
src/plugins/switch/Makefile.in | 1 +
src/plugins/switch/elan/Makefile.in | 1 +
src/plugins/switch/federation/Makefile.in | 1 +
src/plugins/switch/none/Makefile.in | 1 +
src/plugins/task/Makefile.in | 1 +
src/plugins/task/affinity/Makefile.in | 1 +
src/plugins/task/none/Makefile.in | 1 +
src/sacct/Makefile.in | 1 +
src/salloc/Makefile.in | 1 +
src/sattach/Makefile.in | 1 +
src/sbatch/Makefile.in | 1 +
src/sbcast/Makefile.in | 1 +
src/scancel/Makefile.in | 1 +
src/scontrol/Makefile.in | 1 +
src/sinfo/Makefile.in | 1 +
src/slaunch/Makefile.in | 1 +
src/slurmctld/Makefile.in | 1 +
src/slurmctld/controller.c | 1 +
src/slurmctld/proc_req.c | 1 +
src/slurmctld/read_config.c | 25 +-
src/slurmd/Makefile.in | 1 +
src/slurmd/slurmd/Makefile.in | 1 +
src/slurmd/slurmd/slurmd.c | 1 +
src/slurmd/slurmstepd/Makefile.in | 1 +
src/smap/Makefile.in | 1 +
src/squeue/Makefile.in | 1 +
src/srun/Makefile.in | 1 +
src/strigger/Makefile.in | 1 +
src/sview/Makefile.in | 1 +
testsuite/Makefile.in | 1 +
testsuite/expect/Makefile.in | 1 +
testsuite/expect/test7.9 | 10 +
testsuite/expect/test7.9.prog.c | 14 +-
testsuite/slurm_unit/Makefile.in | 1 +
testsuite/slurm_unit/api/Makefile.in | 1 +
testsuite/slurm_unit/api/manual/Makefile.in | 1 +
testsuite/slurm_unit/common/Makefile.in | 1 +
testsuite/slurm_unit/slurmctld/Makefile.in | 1 +
testsuite/slurm_unit/slurmd/Makefile.in | 1 +
121 files changed, 1948 insertions(+), 217 deletions(-)
create mode 100644 src/plugins/crypto/Makefile.am
create mode 100644 src/plugins/crypto/Makefile.in
create mode 100644 src/plugins/crypto/openssl/Makefile.am
create mode 100644 src/plugins/crypto/openssl/Makefile.in
create mode 100644 src/plugins/crypto/openssl/crypto_openssl.c
diff --git a/Makefile.in b/Makefile.in
index 2759b511c53..f7374855fca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -144,6 +144,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/NEWS b/NEWS
index 5f32b6d545f..a77e46294e4 100644
--- a/NEWS
+++ b/NEWS
@@ -11,13 +11,16 @@ documents those changes that are of interest to users and admins.
-- Add new configuration paramter "PrivateData". This can be used to
prevent a user from seeing jobs or job steps belonging to other users.
-- Added configuration parameters for node power save mode: ResumeProgram
- ResumeRate, SuspendExcNodes, SuspendExcParts, SuspendProgram and SuspendRate.
+ ResumeRate, SuspendExcNodes, SuspendExcParts, SuspendProgram and
+ SuspendRate.
-- Slurmctld maintains the IP address (rather than hostname) for srun
communications. This fixes some possible network routing issues.
-- Added global database plugin. Job accounting and Job completion are the
first to use it. Follow documentation to add more to the plugin.
-- Removed no-longer-needed jobacct/common/common_slurmctld.c since that is
replaced by the database plugin.
+ -- Moved digital signature logic into new plugin: crypto/openssl.
+ Added new configuration parameter: CryptoType
* Changes in SLURM 1.2.12
=========================
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 539997fa816..a8b637f62f2 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -26,6 +26,8 @@ CONFIGURATION FILE CHANGES
* Job accounting and termination data can be written to a database as specified
by these new parameters: DatabaseType (flatfile, mysql, and pgsql),
DatabaseHost, DatabasePass, DatabasePort, and DatabaseUser.
+* Added new paramter "CryptoType" to specify digital signature plugin to
+ be used. Currenly only supports crypto/openssl.
* See "man slurm.conf" for more information.
OTHER CHANGES
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index 43d879f3046..95522e44c0e 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -107,6 +107,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/auxdir/x_ac_slurm_ssl.m4 b/auxdir/x_ac_slurm_ssl.m4
index 338bc55d5ad..c88e9755422 100644
--- a/auxdir/x_ac_slurm_ssl.m4
+++ b/auxdir/x_ac_slurm_ssl.m4
@@ -97,17 +97,17 @@ AC_DEFUN([X_AC_SLURM_WITH_SSL], [
return(RAND_status() <= 0);
}
]])],[
- found_crypto=1
+ ac_have_openssl="yes"
break;
],[
],[])
- if test ! -z "$found_crypto" ; then
+ if test ! -z "$ac_have_openssl" ; then
break;
fi
done
- if test -z "$found_crypto" ; then
+ if test -z "$ac_have_openssl" ; then
AC_MSG_ERROR([Could not find working OpenSSL library, download from www.openssl.org])
fi
if test -z "$ssldir" ; then
diff --git a/configure b/configure
index ce1c45e5ca0..fe6dbc40816 100755
--- a/configure
+++ b/configure
@@ -946,6 +946,9 @@ READLINE_LIBS
SSL_LDFLAGS
SSL_LIBS
SSL_CPPFLAGS
+HAVE_OPENSSL_TRUE
+HAVE_OPENSSL_FALSE
+HAVE_OPENSSL
MUNGE_LIBS
MUNGE_CPPFLAGS
MUNGE_LDFLAGS
@@ -7089,7 +7092,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7092 "configure"' > conftest.$ac_ext
+ echo '#line 7095 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8869,11 +8872,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8872: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8875: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8876: \$? = $ac_status" >&5
+ echo "$as_me:8879: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9137,11 +9140,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9140: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9143: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9144: \$? = $ac_status" >&5
+ echo "$as_me:9147: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9241,11 +9244,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9244: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9247: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9248: \$? = $ac_status" >&5
+ echo "$as_me:9251: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11538,7 +11541,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11541 "configure"
+#line 11544 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11638,7 +11641,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11641 "configure"
+#line 11644 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13974,11 +13977,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13977: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13980: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13981: \$? = $ac_status" >&5
+ echo "$as_me:13984: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14078,11 +14081,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14081: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14084: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14085: \$? = $ac_status" >&5
+ echo "$as_me:14088: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15639,11 +15642,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15642: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15645: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15646: \$? = $ac_status" >&5
+ echo "$as_me:15649: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15743,11 +15746,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15746: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15749: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15750: \$? = $ac_status" >&5
+ echo "$as_me:15753: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17930,11 +17933,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17933: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17936: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17937: \$? = $ac_status" >&5
+ echo "$as_me:17940: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18198,11 +18201,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18201: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18204: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18205: \$? = $ac_status" >&5
+ echo "$as_me:18208: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18302,11 +18305,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18305: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18308: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18309: \$? = $ac_status" >&5
+ echo "$as_me:18312: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -26186,7 +26189,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- found_crypto=1
+ ac_have_openssl="yes"
break;
else
@@ -26203,12 +26206,12 @@ fi
- if test ! -z "$found_crypto" ; then
+ if test ! -z "$ac_have_openssl" ; then
break;
fi
done
- if test -z "$found_crypto" ; then
+ if test -z "$ac_have_openssl" ; then
{ { echo "$as_me:$LINENO: error: Could not find working OpenSSL library, download from www.openssl.org" >&5
echo "$as_me: error: Could not find working OpenSSL library, download from www.openssl.org" >&2;}
{ (exit 1); exit 1; }; }
@@ -26296,6 +26299,14 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
LDFLAGS="$saved_LDFLAGS"
+ if test "x$ac_have_openssl" = "xyes"; then
+ HAVE_OPENSSL_TRUE=
+ HAVE_OPENSSL_FALSE='#'
+else
+ HAVE_OPENSSL_TRUE='#'
+ HAVE_OPENSSL_FALSE=
+fi
+
@@ -26533,7 +26544,7 @@ _ACEOF
-ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile src/Makefile src/api/Makefile src/common/Makefile src/sacct/Makefile src/salloc/Makefile src/sbatch/Makefile src/sattach/Makefile src/srun/Makefile src/slaunch/Makefile src/slurmd/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/none/Makefile src/plugins/jobacct/Makefile src/plugins/jobacct/linux/Makefile src/plugins/jobacct/aix/Makefile src/plugins/jobacct/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/database/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/rms/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/gang/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/block_allocator/Makefile src/plugins/select/bluegene/plugin/Makefile src/plugins/select/linear/Makefile src/plugins/select/cons_res/Makefile src/plugins/switch/Makefile src/plugins/switch/elan/Makefile src/plugins/switch/none/Makefile src/plugins/switch/federation/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/none/Makefile src/plugins/database/Makefile src/plugins/database/flatfile/Makefile src/plugins/database/mysql/Makefile src/plugins/database/pgsql/Makefile doc/Makefile doc/man/Makefile doc/html/Makefile doc/html/configurator.html testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/slurmctld/Makefile testsuite/slurm_unit/slurmd/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile"
+ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile src/Makefile src/api/Makefile src/common/Makefile src/sacct/Makefile src/salloc/Makefile src/sbatch/Makefile src/sattach/Makefile src/srun/Makefile src/slaunch/Makefile src/slurmd/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/none/Makefile src/plugins/crypto/Makefile src/plugins/crypto/openssl/Makefile src/plugins/jobacct/Makefile src/plugins/jobacct/linux/Makefile src/plugins/jobacct/aix/Makefile src/plugins/jobacct/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/database/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/rms/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/gang/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/block_allocator/Makefile src/plugins/select/bluegene/plugin/Makefile src/plugins/select/linear/Makefile src/plugins/select/cons_res/Makefile src/plugins/switch/Makefile src/plugins/switch/elan/Makefile src/plugins/switch/none/Makefile src/plugins/switch/federation/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/none/Makefile src/plugins/database/Makefile src/plugins/database/flatfile/Makefile src/plugins/database/mysql/Makefile src/plugins/database/pgsql/Makefile doc/Makefile doc/man/Makefile doc/html/Makefile doc/html/configurator.html testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/slurmctld/Makefile testsuite/slurm_unit/slurmd/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile"
cat >confcache <<\_ACEOF
@@ -26758,6 +26769,13 @@ echo "$as_me: error: conditional \"HAVE_SGI_JOB\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAVE_OPENSSL_TRUE}" && test -z "${HAVE_OPENSSL_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_OPENSSL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_OPENSSL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${WITH_MUNGE_TRUE}" && test -z "${WITH_MUNGE_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"WITH_MUNGE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -27274,6 +27292,8 @@ do
"src/plugins/checkpoint/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/checkpoint/Makefile" ;;
"src/plugins/checkpoint/aix/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/checkpoint/aix/Makefile" ;;
"src/plugins/checkpoint/none/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/checkpoint/none/Makefile" ;;
+ "src/plugins/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/crypto/Makefile" ;;
+ "src/plugins/crypto/openssl/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/crypto/openssl/Makefile" ;;
"src/plugins/jobacct/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/jobacct/Makefile" ;;
"src/plugins/jobacct/linux/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/jobacct/linux/Makefile" ;;
"src/plugins/jobacct/aix/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/jobacct/aix/Makefile" ;;
@@ -27615,6 +27635,9 @@ READLINE_LIBS!$READLINE_LIBS$ac_delim
SSL_LDFLAGS!$SSL_LDFLAGS$ac_delim
SSL_LIBS!$SSL_LIBS$ac_delim
SSL_CPPFLAGS!$SSL_CPPFLAGS$ac_delim
+HAVE_OPENSSL_TRUE!$HAVE_OPENSSL_TRUE$ac_delim
+HAVE_OPENSSL_FALSE!$HAVE_OPENSSL_FALSE$ac_delim
+HAVE_OPENSSL!$HAVE_OPENSSL$ac_delim
MUNGE_LIBS!$MUNGE_LIBS$ac_delim
MUNGE_CPPFLAGS!$MUNGE_CPPFLAGS$ac_delim
MUNGE_LDFLAGS!$MUNGE_LDFLAGS$ac_delim
@@ -27627,7 +27650,7 @@ WITH_AUTHD_FALSE!$WITH_AUTHD_FALSE$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index 31bdfa5bc19..95f25720fe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,7 +189,8 @@ X_AC_READLINE
dnl
dnl
X_AC_SLURM_WITH_SSL
-
+AM_CONDITIONAL(HAVE_OPENSSL, test "x$ac_have_openssl" = "xyes")
+AC_SUBST(HAVE_OPENSSL)
dnl
dnl Check for compilation of SLURM auth modules:
@@ -267,6 +268,8 @@ AC_CONFIG_FILES([Makefile
src/plugins/checkpoint/Makefile
src/plugins/checkpoint/aix/Makefile
src/plugins/checkpoint/none/Makefile
+ src/plugins/crypto/Makefile
+ src/plugins/crypto/openssl/Makefile
src/plugins/jobacct/Makefile
src/plugins/jobacct/linux/Makefile
src/plugins/jobacct/aix/Makefile
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f7b332c621d..83b15f4f0f8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -118,6 +118,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index e662ef2652c..3f6979614c5 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -117,6 +117,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/doc/html/configurator.html.in b/doc/html/configurator.html.in
index 241570b62e1..713fb9718f3 100644
--- a/doc/html/configurator.html.in
+++ b/doc/html/configurator.html.in
@@ -122,6 +122,7 @@ function displayfile()
"AuthType=auth/" + get_radio_value(document.config.auth_type) + "<br>" +
get_field("JobCredentialPrivateKey", document.config.private_key) + "<br>" +
get_field("JobCredentialPublicCertificate", document.config.public_key) + "<br>" +
+ "CryptoType=" + get_radio_value(document.config.crypto_type) + "<br>" +
"StateSaveLocation=" + document.config.state_save_location.value + "<br>" +
"SlurmdSpoolDir=" + document.config.slurmd_spool_dir.value + "<br>" +
"SwitchType=switch/" + get_radio_value(document.config.switch_type) + "<br>" +
@@ -347,7 +348,7 @@ fails by using an interal default set at SLURM build time.
<input type="text" name="slurmd_port" value="6818"> <B>SlurmdPort</B>
<P>
-<H2>Authentication</H2>
+<H2>Authentication and Security</H2>
Define the method used for authenticating communicating between SLURM components.<BR>
Select one value for <B>AuthType</B>:<BR>
<input type="radio" name="auth_type" value="none"> <B>None</B>: No authentication,
@@ -363,6 +364,11 @@ Specify fully qualified pathnames. Both values are required.
<P>
<input type="text" name="public_key"> <B>JobCredentialPublicCertificate</B>
<P>
+Library used for job step cryptographic signature generation.<BR>
+Select one value for <B>CryptoType</B>:<BR>
+<input type="radio" name="crypto_type" value="gnupg"> <B>GnuPG</B>: Gnu Privacy Guard<BR>
+<input type="radio" name="crypto_type" value="openssl" checked> <B>OpenSSL</B>
+<P>
<H2>State Preservation</H2>
Define the location of a directory where the slurmctld daemon saves its state.
@@ -653,6 +659,6 @@ before terminating all remaining tasks. A value of zero indicates unlimited wait
</FORM>
<HR>
<p class="footer">UCRL-WEB-225274<br>
-Last modified 2 July 2007</p>
+Last modified 11 July 2007</p>
</BODY>
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index a4edae2acc4..7ebfba0c3e6 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -114,6 +114,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 4ac765270d4..c263a2a7dd7 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -78,7 +78,7 @@ The default value is 0 to disable caching group data.
.TP
\fBCheckpointType\fR
Define the system\-initiated checkpoint method to be used for user jobs.
-The slurmctld daemon must be restarted for a change in CheckpointType
+The slurmctld daemon must be restarted for a change in \fBCheckpointType\fR
to take effect.
Acceptable values at present include "checkpoint/none" and "checkpoint/aix"
(only on AIX systems).
@@ -101,6 +101,15 @@ This should be a node name without the full domain name (e.g. "lx0001").
This value must be specified.
See the \fBRELOCATING CONTROLLERS\fR section if you change this.
+.TP
+\fBCryptoType\fR
+Define the cryptographic signature tool to be used in the creation of
+job step credentials.
+The slurmctld daemon must be restarted for a change in \fBCryptoType\fR
+to take effect.
+Acceptable values at present include "crypto/openssl".
+The default value is "crypto/openssl".
+
.TP
\fBDatabaseHost\fR
Define the Host the database server is running on.
diff --git a/slurm.spec b/slurm.spec
index 1330b9a6e09..e553deb590c 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -173,6 +173,8 @@ if [ -d /etc/init.d ]; then
fi
test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/task_affinity.so &&
echo %{_libdir}/slurm/task_affinity.so >> $LIST
+test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/crypto_openssl.so &&
+ echo %{_libdir}/slurm/crypto_openssl.so >> $LIST
# Build file lists for optional plugin packages
for plugin in auth_munge auth_authd; do
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index df63c69adc8..986a932adc2 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -859,6 +859,7 @@ typedef struct slurm_ctl_conf {
char *checkpoint_type; /* checkpoint plugin type */
char *control_addr; /* comm path of slurmctld primary server */
char *control_machine; /* name of slurmctld primary server */
+ char *crypto_type; /* cryptographic signature plugin */
char *epilog; /* pathname of job epilog */
uint32_t first_job_id; /* first slurm generated job_id to assign */
uint32_t next_job_id; /* next slurm generated job_id to assign */
diff --git a/slurm/slurm_errno.h b/slurm/slurm_errno.h
index 6143acfde7d..5e875172ba5 100644
--- a/slurm/slurm_errno.h
+++ b/slurm/slurm_errno.h
@@ -150,6 +150,7 @@ enum {
ESLURM_TASKDIST_ARBITRARY_UNSUPPORTED,
ESLURM_TASKDIST_REQUIRES_OVERCOMMIT,
ESLURM_JOB_HELD,
+ ESLURM_INVALID_CRYPTO_TYPE_CHANGE,
/* switch specific error codes, specific values defined in plugin module */
ESLURM_SWITCH_MIN = 3000,
diff --git a/src/Makefile.in b/src/Makefile.in
index 4538cfd182b..dfa80f5a934 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -118,6 +118,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index b8dccbf58b2..24a087b8657 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -158,6 +158,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/api/config_info.c b/src/api/config_info.c
index 0c3aa9e717a..263194c3911 100644
--- a/src/api/config_info.c
+++ b/src/api/config_info.c
@@ -135,6 +135,8 @@ void slurm_print_ctl_conf ( FILE* out,
slurm_ctl_conf_ptr->control_addr);
fprintf(out, "ControlMachine = %s\n",
slurm_ctl_conf_ptr->control_machine);
+ fprintf(out, "CryptoType = %s\n",
+ slurm_ctl_conf_ptr->crypto_type);
fprintf(out, "DatabaseType = %s\n",
slurm_ctl_conf_ptr->database_type);
fprintf(out, "DatabaseHost = %s\n",
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 96ad110c798..900a0755016 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -186,6 +186,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/common/read_config.c b/src/common/read_config.c
index 4f10644d37a..17a26b43e27 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -136,6 +136,7 @@ s_p_options_t slurm_conf_options[] = {
{"BackupController", S_P_STRING},
{"ControlAddr", S_P_STRING},
{"ControlMachine", S_P_STRING},
+ {"CryptoType", S_P_STRING},
{"Epilog", S_P_STRING},
{"FastSchedule", S_P_UINT16},
{"FirstJobId", S_P_UINT32},
@@ -1051,6 +1052,7 @@ free_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr, bool purge_node_hash)
xfree (ctl_conf_ptr->backup_controller);
xfree (ctl_conf_ptr->control_addr);
xfree (ctl_conf_ptr->control_machine);
+ xfree (ctl_conf_ptr->crypto_type);
xfree (ctl_conf_ptr->epilog);
xfree (ctl_conf_ptr->job_acct_loc);
xfree (ctl_conf_ptr->job_acct_type);
@@ -1111,6 +1113,7 @@ init_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr)
xfree (ctl_conf_ptr->backup_controller);
xfree (ctl_conf_ptr->control_addr);
xfree (ctl_conf_ptr->control_machine);
+ xfree (ctl_conf_ptr->crypto_type);
xfree (ctl_conf_ptr->epilog);
ctl_conf_ptr->fast_schedule = (uint16_t) NO_VAL;
ctl_conf_ptr->first_job_id = (uint32_t) NO_VAL;
@@ -1461,6 +1464,9 @@ validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if (!s_p_get_string(&conf->checkpoint_type, "CheckpointType", hashtbl))
conf->checkpoint_type = xstrdup(DEFAULT_CHECKPOINT_TYPE);
+ if (!s_p_get_string(&conf->crypto_type, "CryptoType", hashtbl))
+ conf->crypto_type = xstrdup(DEFAULT_CRYPTO_TYPE);
+
s_p_get_string(&conf->epilog, "Epilog", hashtbl);
if (!s_p_get_uint16(&conf->fast_schedule, "FastSchedule", hashtbl))
diff --git a/src/common/read_config.h b/src/common/read_config.h
index 1d685f5441f..65211fdc957 100644
--- a/src/common/read_config.h
+++ b/src/common/read_config.h
@@ -50,6 +50,7 @@ extern char *default_plugstack;
#define DEFAULT_AUTH_TYPE "auth/none"
#define DEFAULT_CACHE_GROUPS 0
+#define DEFAULT_CRYPTO_TYPE "crypto/openssl"
#define DEFAULT_FAST_SCHEDULE 1
#define DEFAULT_FIRST_JOB_ID 1
/* NOTE: DEFAULT_INACTIVE_LIMIT must be 0 for Blue Gene/L systems */
diff --git a/src/common/slurm_cred.c b/src/common/slurm_cred.c
index 24716a87aa6..515d52d4c45 100644
--- a/src/common/slurm_cred.c
+++ b/src/common/slurm_cred.c
@@ -4,7 +4,7 @@
*****************************************************************************
* Copyright (C) 2002-2006 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Mark A. Grondona <mgrondona@llnl.gov>.
+ * Written by Morris Jette <jette1@llnl.gov>.
* UCRL-CODE-226842.
*
* This file is part of SLURM, a resource management program.
@@ -47,24 +47,21 @@
#include <stdlib.h>
#include <sys/time.h>
-/*
- * OpenSSL includes
- */
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/err.h>
-
#if WITH_PTHREADS
# include <pthread.h>
#endif /* WITH_PTHREADS */
-#include "src/common/macros.h"
+#include "src/common/io_hdr.h"
#include "src/common/list.h"
#include "src/common/log.h"
+#include "src/common/macros.h"
+#include "src/common/plugin.h"
+#include "src/common/plugrack.h"
+#include "src/common/slurm_protocol_api.h"
#include "src/common/xmalloc.h"
#include "src/common/xassert.h"
#include "src/common/xstring.h"
-#include "src/common/io_hdr.h"
+
#include "src/common/slurm_cred.h"
@@ -106,6 +103,9 @@ enum ctx_type {
SLURM_CRED_VERIFIER
};
+/*
+ * Credential context, slurm_cred_ctx_t:
+ */
struct slurm_cred_context {
#ifndef NDEBUG
# define CRED_CTX_MAGIC 0x0c0c0c
@@ -115,20 +115,19 @@ struct slurm_cred_context {
pthread_mutex_t mutex;
#endif
enum ctx_type type; /* type of context (creator or verifier) */
- EVP_PKEY *key; /* private or public key */
+ void *key; /* private or public key */
List job_list; /* List of used jobids (for verifier) */
List state_list; /* List of cred states (for verifier) */
- int expiry_window; /* expiration window for cached creds */
+ int expiry_window;/* expiration window for cached creds */
- EVP_PKEY *exkey; /* Old public key if key is updated */
+ void *exkey; /* Old public key if key is updated */
time_t exkey_exp; /* Old key expiration time */
};
/*
- * Completion of slurm job credential type:
- *
+ * Completion of slurm job credential type, slurm_cred_t:
*/
struct slurm_job_credential {
#ifndef NDEBUG
@@ -138,18 +137,52 @@ struct slurm_job_credential {
#ifdef WITH_PTHREADS
pthread_mutex_t mutex;
#endif
- uint32_t jobid; /* Job ID associated with this credential */
- uint32_t stepid; /* Job step ID for this credential */
- uid_t uid; /* user for which this cred is valid */
- time_t ctime; /* time of credential creation */
- char *nodes; /* list of hostnames for which the cred is ok*/
- uint32_t alloc_lps_cnt; /* Number of hosts in the list above */
- uint32_t *alloc_lps; /* Number of tasks on each host */
-
- unsigned char *signature; /* credential signature */
- unsigned int siglen; /* signature length in bytes */
+ uint32_t jobid; /* Job ID associated with this cred */
+ uint32_t stepid; /* Job step ID for this credential */
+ uid_t uid; /* user for which this cred is valid */
+ time_t ctime; /* time of credential creation */
+ char *nodes; /* hostnames for which the cred is ok */
+ uint32_t alloc_lps_cnt;/* Number of hosts in the list above */
+ uint32_t *alloc_lps; /* Number of tasks on each host */
+
+ char *signature; /* credential signature */
+ unsigned int siglen; /* signature length in bytes */
};
+/*
+ * WARNING: Do not change the order of these fields or add additional
+ * fields at the beginning of the structure. If you do, job accounting
+ * plugins will stop working. If you need to add fields, add them
+ * at the end of the structure.
+ */
+typedef struct slurm_crypto_ops {
+ void *(*crypto_read_private_key) (const char *path);
+ void *(*crypto_read_public_key) (const char *path);
+ void (*crypto_destroy_key) (void *key);
+ int (*crypto_sign) (void * key, char *buffer,
+ int buf_size, char **sig_pp,
+ unsigned int *sig_size_p);
+ int (*crypto_verify_sign) (void * key, char *buffer,
+ unsigned int buf_size,
+ char *signature, int sig_size);
+ char *(*crypto_str_error) (void);
+} slurm_crypto_ops_t;
+
+/*
+ * A global cryptographic context. "Global" in the sense that there's
+ * only one, with static bindings. We don't export it.
+ */
+
+typedef struct slurm_crypto_context {
+ char *crypto_type;
+ plugrack_t plugin_list;
+ plugin_handle_t cur_plugin;
+ int crypto_errno;
+ slurm_crypto_ops_t ops;
+} slurm_crypto_context_t;
+
+static slurm_crypto_context_t *g_crypto_context = NULL;
+static pthread_mutex_t g_crypto_context_lock = PTHREAD_MUTEX_INITIALIZER;
/*
@@ -180,12 +213,12 @@ static void _verifier_ctx_init(slurm_cred_ctx_t ctx);
static bool _credential_replayed(slurm_cred_ctx_t ctx, slurm_cred_t cred);
static bool _credential_revoked(slurm_cred_ctx_t ctx, slurm_cred_t cred);
-static EVP_PKEY * _read_private_key(const char *path);
-static EVP_PKEY * _read_public_key(const char *path);
-
static int _slurm_cred_sign(slurm_cred_ctx_t ctx, slurm_cred_t cred);
static int _slurm_cred_verify_signature(slurm_cred_ctx_t ctx, slurm_cred_t c);
+static int _slurm_crypto_init(void);
+static int _slurm_crypto_fini(void);
+
static job_state_t * _job_state_unpack_one(Buf buffer);
static cred_state_t * _cred_state_unpack_one(Buf buffer);
@@ -201,20 +234,185 @@ static void _cred_state_pack_one(cred_state_t *s, Buf buffer);
static char * timestr (const time_t *tp, char *buf, size_t n);
#endif
+
+static slurm_crypto_context_t *
+_slurm_crypto_context_create( const char *crypto_type)
+{
+ slurm_crypto_context_t *c;
+
+ if ( crypto_type == NULL ) {
+ error( "_slurm_crypto_context_create: no crypto type" );
+ return NULL;
+ }
+
+ c = xmalloc( sizeof( struct slurm_crypto_context ) );
+
+ c->crypto_errno = SLURM_SUCCESS;
+
+ /* Copy the job completion job completion type. */
+ c->crypto_type = xstrdup( crypto_type );
+ if ( c->crypto_type == NULL ) {
+ error( "can't make local copy of crypto type" );
+ xfree( c );
+ return NULL;
+ }
+
+ /* Plugin rack is demand-loaded on first reference. */
+ c->plugin_list = NULL;
+ c->cur_plugin = PLUGIN_INVALID_HANDLE;
+ c->crypto_errno = SLURM_SUCCESS;
+
+ return c;
+}
+
+static int
+_slurm_crypto_context_destroy( slurm_crypto_context_t *c )
+{
+ /*
+ * Must check return code here because plugins might still
+ * be loaded and active.
+ */
+ if ( c->plugin_list ) {
+ if ( plugrack_destroy( c->plugin_list ) != SLURM_SUCCESS ) {
+ return SLURM_ERROR;
+ }
+ }
+
+ xfree( c->crypto_type );
+ xfree( c );
+
+ return SLURM_SUCCESS;
+}
+
+/*
+ * Resolve the operations from the plugin.
+ */
+static slurm_crypto_ops_t *
+_slurm_crypto_get_ops( slurm_crypto_context_t *c )
+{
+ /*
+ * These strings must be in the same order as the fields declared
+ * for slurm_crypto_ops_t.
+ */
+ static const char *syms[] = {
+ "crypto_read_private_key",
+ "crypto_read_public_key",
+ "crypto_destroy_key",
+ "crypto_sign",
+ "crypto_verify_sign",
+ "crypto_str_error"
+ };
+ int n_syms = sizeof( syms ) / sizeof( char * );
+ int rc = 0;
+ /* Get the plugin list, if needed. */
+ if ( c->plugin_list == NULL ) {
+ char *plugin_dir;
+ c->plugin_list = plugrack_create();
+ if ( c->plugin_list == NULL ) {
+ error( "Unable to create a plugin manager" );
+ return NULL;
+ }
+
+ plugrack_set_major_type( c->plugin_list, "crypto" );
+ plugrack_set_paranoia( c->plugin_list,
+ PLUGRACK_PARANOIA_NONE,
+ 0 );
+ plugin_dir = slurm_get_plugin_dir();
+ plugrack_read_dir( c->plugin_list, plugin_dir );
+ xfree(plugin_dir);
+ }
+
+ /* Find the correct plugin. */
+ c->cur_plugin =
+ plugrack_use_by_type( c->plugin_list, c->crypto_type );
+ if ( c->cur_plugin == PLUGIN_INVALID_HANDLE ) {
+ error( "can't find a plugin for type %s", c->crypto_type );
+ return NULL;
+ }
+
+ /* Dereference the API. */
+ if ( (rc = plugin_get_syms( c->cur_plugin,
+ n_syms,
+ syms,
+ (void **) &c->ops )) < n_syms ) {
+ error( "incomplete crypto plugin detected only "
+ "got %d out of %d",
+ rc, n_syms);
+ return NULL;
+ }
+
+ return &c->ops;
+}
+
+static int _slurm_crypto_init(void)
+{
+ char *crypto_type = NULL;
+ int retval=SLURM_SUCCESS;
+
+ slurm_mutex_lock( &g_crypto_context_lock );
+ if ( g_crypto_context )
+ goto done;
+
+ crypto_type = slurm_get_crypto_type();
+ g_crypto_context = _slurm_crypto_context_create( crypto_type );
+ if ( g_crypto_context == NULL ) {
+ error( "cannot create a context for %s", crypto_type );
+ retval = SLURM_ERROR;
+ goto done;
+ }
+
+ if ( _slurm_crypto_get_ops( g_crypto_context ) == NULL ) {
+ error( "cannot resolve job accounting plugin operations" );
+ _slurm_crypto_context_destroy( g_crypto_context );
+ g_crypto_context = NULL;
+ retval = SLURM_ERROR;
+ }
+
+ done:
+ slurm_mutex_unlock( &g_crypto_context_lock );
+ xfree(crypto_type);
+
+ return(retval);
+}
+
+static int _slurm_crypto_fini(void)
+{
+ int rc;
+
+ if (!g_crypto_context)
+ return SLURM_SUCCESS;
+
+ rc = _slurm_crypto_context_destroy(g_crypto_context);
+ g_crypto_context = NULL;
+ return rc;
+}
+
+/* Terminate the plugin and release all memory. */
+extern int slurm_crypto_fini(void)
+{
+ if (_slurm_crypto_fini() < 0)
+ return SLURM_ERROR;
+
+ return SLURM_SUCCESS;
+}
+
slurm_cred_ctx_t
slurm_cred_creator_ctx_create(const char *path)
{
slurm_cred_ctx_t ctx = NULL;
xassert(path != NULL);
+ if (_slurm_crypto_init() < 0)
+ return NULL;
ctx = _slurm_cred_ctx_alloc();
slurm_mutex_lock(&ctx->mutex);
ctx->type = SLURM_CRED_CREATOR;
- if (!(ctx->key = _read_private_key(path)))
- goto fail;
+ ctx->key = (*(g_crypto_context->ops.crypto_read_private_key))(path);
+ if (!ctx->key)
+ goto fail;
slurm_mutex_unlock(&ctx->mutex);
return ctx;
@@ -222,6 +420,7 @@ slurm_cred_creator_ctx_create(const char *path)
fail:
slurm_mutex_unlock(&ctx->mutex);
slurm_cred_ctx_destroy(ctx);
+ error("Can not open data encryption key file %s", path);
return NULL;
}
@@ -232,13 +431,16 @@ slurm_cred_verifier_ctx_create(const char *path)
slurm_cred_ctx_t ctx = NULL;
xassert(path != NULL);
+ if (_slurm_crypto_init() < 0)
+ return NULL;
ctx = _slurm_cred_ctx_alloc();
slurm_mutex_lock(&ctx->mutex);
ctx->type = SLURM_CRED_VERIFIER;
- if (!(ctx->key = _read_public_key(path)))
+ ctx->key = (*(g_crypto_context->ops.crypto_read_public_key))(path);
+ if (!ctx->key)
goto fail;
_verifier_ctx_init(ctx);
@@ -249,6 +451,7 @@ slurm_cred_verifier_ctx_create(const char *path)
fail:
slurm_mutex_unlock(&ctx->mutex);
slurm_cred_ctx_destroy(ctx);
+ error("Can not open data encryption key file %s", path);
return NULL;
}
@@ -258,12 +461,14 @@ slurm_cred_ctx_destroy(slurm_cred_ctx_t ctx)
{
if (ctx == NULL)
return;
+ if (_slurm_crypto_init() < 0)
+ return;
slurm_mutex_lock(&ctx->mutex);
xassert(ctx->magic == CRED_CTX_MAGIC);
if (ctx->key)
- EVP_PKEY_free(ctx->key);
+ (*(g_crypto_context->ops.crypto_destroy_key))(ctx->key);
if (ctx->job_list)
list_destroy(ctx->job_list);
if (ctx->state_list)
@@ -344,6 +549,9 @@ slurm_cred_ctx_get(slurm_cred_ctx_t ctx, slurm_cred_opt_t opt, ...)
int
slurm_cred_ctx_key_update(slurm_cred_ctx_t ctx, const char *path)
{
+ if (_slurm_crypto_init() < 0)
+ return SLURM_ERROR;
+
if (ctx->type == SLURM_CRED_CREATOR)
return _ctx_update_private_key(ctx, path);
else
@@ -358,6 +566,8 @@ slurm_cred_create(slurm_cred_ctx_t ctx, slurm_cred_arg_t *arg)
xassert(ctx != NULL);
xassert(arg != NULL);
+ if (_slurm_crypto_init() < 0)
+ return NULL;
slurm_mutex_lock(&ctx->mutex);
@@ -380,7 +590,8 @@ slurm_cred_create(slurm_cred_ctx_t ctx, slurm_cred_arg_t *arg)
cred->alloc_lps = NULL;
if (cred->alloc_lps_cnt > 0) {
cred->alloc_lps = xmalloc(cred->alloc_lps_cnt * sizeof(uint32_t));
- memcpy(cred->alloc_lps, arg->alloc_lps, cred->alloc_lps_cnt * sizeof(uint32_t));
+ memcpy(cred->alloc_lps, arg->alloc_lps,
+ cred->alloc_lps_cnt * sizeof(uint32_t));
}
cred->ctime = time(NULL);
@@ -428,6 +639,9 @@ slurm_cred_copy(slurm_cred_t cred)
rcred->alloc_lps_cnt * sizeof(uint32_t));
}
rcred->ctime = cred->ctime;
+ rcred->siglen = cred->siglen;
+ /* Assumes signature is a string,
+ * otherwise use xmalloc and strcpy here */
rcred->signature = (unsigned char *)xstrdup((char *)cred->signature);
slurm_mutex_unlock(&cred->mutex);
@@ -456,7 +670,8 @@ slurm_cred_faker(slurm_cred_arg_t *arg)
cred->alloc_lps = NULL;
if (cred->alloc_lps_cnt > 0) {
cred->alloc_lps = xmalloc(cred->alloc_lps_cnt * sizeof(uint32_t));
- memcpy(cred->alloc_lps, arg->alloc_lps, cred->alloc_lps_cnt * sizeof(uint32_t));
+ memcpy(cred->alloc_lps, arg->alloc_lps,
+ cred->alloc_lps_cnt * sizeof(uint32_t));
}
cred->ctime = time(NULL);
cred->siglen = SLURM_IO_KEY_SIZE;
@@ -494,6 +709,8 @@ slurm_cred_verify(slurm_cred_ctx_t ctx, slurm_cred_t cred,
xassert(ctx != NULL);
xassert(cred != NULL);
xassert(arg != NULL);
+ if (_slurm_crypto_init() < 0)
+ return SLURM_ERROR;
slurm_mutex_lock(&ctx->mutex);
slurm_mutex_lock(&cred->mutex);
@@ -537,7 +754,8 @@ slurm_cred_verify(slurm_cred_ctx_t ctx, slurm_cred_t cred,
arg->alloc_lps = NULL;
if (arg->alloc_lps_cnt > 0) {
arg->alloc_lps = xmalloc(arg->alloc_lps_cnt * sizeof(uint32_t));
- memcpy(arg->alloc_lps, cred->alloc_lps, arg->alloc_lps_cnt * sizeof(uint32_t));
+ memcpy(arg->alloc_lps, cred->alloc_lps,
+ arg->alloc_lps_cnt * sizeof(uint32_t));
}
slurm_mutex_unlock(&cred->mutex);
@@ -841,50 +1059,6 @@ slurm_cred_print(slurm_cred_t cred)
}
-static EVP_PKEY *
-_read_private_key(const char *path)
-{
- FILE *fp = NULL;
- EVP_PKEY *pk = NULL;
-
- xassert(path != NULL);
-
- if (!(fp = fopen(path, "r"))) {
- error ("can't open key file '%s' : %m", path);
- return NULL;
- }
-
- if (!PEM_read_PrivateKey(fp, &pk, NULL, NULL))
- error ("PEM_read_PrivateKey [%s]: %m", path);
-
- fclose(fp);
-
- return pk;
-}
-
-
-static EVP_PKEY *
-_read_public_key(const char *path)
-{
- FILE *fp = NULL;
- EVP_PKEY *pk = NULL;
-
- xassert(path != NULL);
-
- if ((fp = fopen(path, "r")) == NULL) {
- error ("can't open public key '%s' : %m ", path);
- return NULL;
- }
-
- if (!PEM_read_PUBKEY(fp, &pk, NULL, NULL))
- error("PEM_read_PUBKEY[%s]: %m", path);
-
- fclose(fp);
-
- return pk;
-}
-
-
static void
_verifier_ctx_init(slurm_cred_ctx_t ctx)
{
@@ -902,12 +1076,13 @@ _verifier_ctx_init(slurm_cred_ctx_t ctx)
static int
_ctx_update_private_key(slurm_cred_ctx_t ctx, const char *path)
{
- EVP_PKEY *pk = NULL;
- EVP_PKEY *tmpk = NULL;
+ void *pk = NULL;
+ void *tmpk = NULL;
xassert(ctx != NULL);
- if (!(pk = _read_private_key(path)))
+ pk = (*(g_crypto_context->ops.crypto_read_private_key))(path);
+ if (!pk)
return SLURM_ERROR;
slurm_mutex_lock(&ctx->mutex);
@@ -920,7 +1095,7 @@ _ctx_update_private_key(slurm_cred_ctx_t ctx, const char *path)
slurm_mutex_unlock(&ctx->mutex);
- EVP_PKEY_free(tmpk);
+ (*(g_crypto_context->ops.crypto_destroy_key))(tmpk);
return SLURM_SUCCESS;
}
@@ -929,11 +1104,11 @@ _ctx_update_private_key(slurm_cred_ctx_t ctx, const char *path)
static int
_ctx_update_public_key(slurm_cred_ctx_t ctx, const char *path)
{
- EVP_PKEY *pk = NULL;
+ void *pk = NULL;
xassert(ctx != NULL);
-
- if (!(pk = _read_public_key(path)))
+ pk = (*(g_crypto_context->ops.crypto_read_public_key))(path);
+ if (!pk)
return SLURM_ERROR;
slurm_mutex_lock(&ctx->mutex);
@@ -941,8 +1116,8 @@ _ctx_update_public_key(slurm_cred_ctx_t ctx, const char *path)
xassert(ctx->magic == CRED_CTX_MAGIC);
xassert(ctx->type == SLURM_CRED_VERIFIER);
- if (ctx->exkey)
- EVP_PKEY_free(ctx->exkey);
+ if (ctx->exkey)
+ (*(g_crypto_context->ops.crypto_destroy_key))(ctx->exkey);
ctx->exkey = ctx->key;
ctx->key = pk;
@@ -965,7 +1140,7 @@ _exkey_is_valid(slurm_cred_ctx_t ctx)
if (time(NULL) > ctx->exkey_exp) {
debug2("old job credential key slurmd expired");
- EVP_PKEY_free(ctx->exkey);
+ (*(g_crypto_context->ops.crypto_destroy_key))(ctx->exkey);
ctx->exkey = NULL;
return false;
}
@@ -978,16 +1153,12 @@ static slurm_cred_ctx_t
_slurm_cred_ctx_alloc(void)
{
slurm_cred_ctx_t ctx = xmalloc(sizeof(*ctx));
+ /* Contents initialized to zero */
slurm_mutex_init(&ctx->mutex);
slurm_mutex_lock(&ctx->mutex);
- ctx->key = NULL;
- ctx->job_list = NULL;
- ctx->state_list = NULL;
ctx->expiry_window = DEFAULT_EXPIRATION_WINDOW;
-
- ctx->exkey = NULL;
ctx->exkey_exp = (time_t) -1;
xassert(ctx->magic = CRED_CTX_MAGIC);
@@ -1000,28 +1171,16 @@ static slurm_cred_t
_slurm_cred_alloc(void)
{
slurm_cred_t cred = xmalloc(sizeof(*cred));
+ /* Contents initialized to zero */
slurm_mutex_init(&cred->mutex);
-
- cred->jobid = 0;
- cred->stepid = 0;
- cred->uid = (uid_t) -1;
- cred->nodes = NULL;
- cred->alloc_lps_cnt = 0;
- cred->alloc_lps = NULL;
- cred->signature = NULL;
- cred->siglen = 0;
+ cred->uid = (uid_t) -1;
xassert(cred->magic = CRED_MAGIC);
return cred;
}
-static const char *
-_ssl_error(void)
-{
- return ERR_reason_error_string(ERR_get_error());
-}
#ifdef EXTREME_DEBUG
static void
@@ -1039,76 +1198,47 @@ _print_data(char *data, int datalen)
static int
_slurm_cred_sign(slurm_cred_ctx_t ctx, slurm_cred_t cred)
{
- EVP_MD_CTX ectx;
Buf buffer;
- int rc = SLURM_SUCCESS;
- unsigned int *lenp = &cred->siglen;
- int ksize = EVP_PKEY_size(ctx->key);
-
- /*
- * Allocate memory for signature: at most EVP_PKEY_size() bytes
- */
- cred->signature = xmalloc(ksize * sizeof(unsigned char));
+ int rc;
buffer = init_buf(4096);
_pack_cred(cred, buffer);
-
- EVP_SignInit(&ectx, EVP_sha1());
- EVP_SignUpdate(&ectx, get_buf_data(buffer), get_buf_offset(buffer));
-
- if (!(EVP_SignFinal(&ectx, cred->signature, lenp, ctx->key))) {
- ERR_print_errors_fp(log_fp());
- rc = SLURM_ERROR;
- }
-
-#ifdef HAVE_EVP_MD_CTX_CLEANUP
- /* Note: Likely memory leak if this function is absent */
- EVP_MD_CTX_cleanup(&ectx);
-#endif
+ rc = (*(g_crypto_context->ops.crypto_sign))(ctx->key,
+ get_buf_data(buffer), get_buf_offset(buffer),
+ &cred->signature, &cred->siglen);
free_buf(buffer);
- return rc;
+ if (rc)
+ return SLURM_ERROR;
+ return SLURM_SUCCESS;
}
static int
_slurm_cred_verify_signature(slurm_cred_ctx_t ctx, slurm_cred_t cred)
{
- EVP_MD_CTX ectx;
Buf buffer;
int rc;
- unsigned char *sig = cred->signature;
- int siglen = cred->siglen;
+ debug("Checking credential with %d bytes of sig data", cred->siglen);
buffer = init_buf(4096);
_pack_cred(cred, buffer);
- debug("Checking credential with %d bytes of sig data", siglen);
-
- EVP_VerifyInit(&ectx, EVP_sha1());
- EVP_VerifyUpdate(&ectx, get_buf_data(buffer), get_buf_offset(buffer));
-
- if (!(rc = EVP_VerifyFinal(&ectx, sig, siglen, ctx->key))) {
- /*
- * Check against old key if one exists and is valid
- */
- if (_exkey_is_valid(ctx))
- rc = EVP_VerifyFinal(&ectx, sig, siglen, ctx->exkey);
+ rc = (*(g_crypto_context->ops.crypto_verify_sign))(ctx->key,
+ get_buf_data(buffer), get_buf_offset(buffer),
+ cred->signature, cred->siglen);
+ if (rc && _exkey_is_valid(ctx)) {
+ rc = (*(g_crypto_context->ops.crypto_verify_sign))(ctx->key,
+ get_buf_data(buffer), get_buf_offset(buffer),
+ cred->signature, cred->siglen);
}
-
- if (!rc) {
- ERR_load_crypto_strings();
- info("Credential signature check: %s", _ssl_error());
- rc = SLURM_ERROR;
- } else
- rc = SLURM_SUCCESS;
-
-#ifdef HAVE_EVP_MD_CTX_CLEANUP
- /* Note: Likely memory leak if this function is absent */
- EVP_MD_CTX_cleanup(&ectx);
-#endif
free_buf(buffer);
- return rc;
+ if (rc) {
+ info("Credential signature check: %s",
+ (*(g_crypto_context->ops.crypto_str_error))());
+ return SLURM_ERROR;
+ }
+ return SLURM_SUCCESS;
}
@@ -1146,7 +1276,8 @@ _credential_replayed(slurm_cred_ctx_t ctx, slurm_cred_t cred)
/*
* If we found a match, this credential is being replayed.
*/
- if (s) return true;
+ if (s)
+ return true;
/*
* Otherwise, save the credential state
@@ -1165,8 +1296,10 @@ static char * timestr (const time_t *tp, char *buf, size_t n)
struct tm tmval;
#ifdef DISABLE_LOCALTIME
static int disabled = 0;
- if (buf == NULL) disabled=1;
- if (disabled) return NULL;
+ if (buf == NULL)
+ disabled=1;
+ if (disabled)
+ return NULL;
#endif
if (!localtime_r (tp, &tmval))
error ("localtime_r: %m");
@@ -1179,15 +1312,15 @@ slurm_cred_handle_reissue(slurm_cred_ctx_t ctx, slurm_cred_t cred)
{
job_state_t *j = _find_job_state(ctx, cred->jobid);
- if (j != NULL && j->revoked && cred->ctime > j->revoked) {
+ if (j != NULL && j->revoked && (cred->ctime > j->revoked)) {
/* The credential has been reissued. Purge the
- old record so that "cred" will look like a new
- credential to any ensuing commands. */
+ * old record so that "cred" will look like a new
+ * credential to any ensuing commands. */
info("reissued job credential for job %u", j->jobid);
/* Setting j->expiration to zero will make
- _clear_expired_job_states() remove this job credential
- from the cred context. */
+ * _clear_expired_job_states() remove this
+ * job credential from the cred context. */
j->expiration = 0;
_clear_expired_job_states(ctx);
}
@@ -1221,7 +1354,7 @@ _credential_revoked(slurm_cred_ctx_t ctx, slurm_cred_t cred)
if (cred->ctime <= j->revoked) {
char buf[64];
- debug ("cred for %d revoked. expires at %s",
+ debug ("cred for %u revoked. expires at %s",
j->jobid, timestr (&j->expiration, buf, 64));
return true;
}
@@ -1237,7 +1370,10 @@ _find_job_state(slurm_cred_ctx_t ctx, uint32_t jobid)
job_state_t *j = NULL;
i = list_iterator_create(ctx->job_list);
- while ((j = list_next(i)) && (j->jobid != jobid)) {;}
+ while ((j = list_next(i))) {
+ if (j->jobid == jobid)
+ break;
+ }
list_iterator_destroy(i);
return j;
}
diff --git a/src/common/slurm_cred.h b/src/common/slurm_cred.h
index ddd726dc55b..11ff3432001 100644
--- a/src/common/slurm_cred.h
+++ b/src/common/slurm_cred.h
@@ -135,6 +135,9 @@ typedef struct {
uint32_t *alloc_lps;
} slurm_cred_arg_t;
+/* Terminate the plugin and release all memory. */
+int slurm_crypto_fini(void);
+
/*
* Create a slurm credential using the values in `arg.'
* The credential is signed using the creators public key.
diff --git a/src/common/slurm_errno.c b/src/common/slurm_errno.c
index b632b528b03..5737a238661 100644
--- a/src/common/slurm_errno.c
+++ b/src/common/slurm_errno.c
@@ -173,6 +173,8 @@ static slurm_errtab_t slurm_errtab[] = {
"AuthType change requires restart of all SLURM daemons and commands"},
{ ESLURM_INVALID_CHECKPOINT_TYPE_CHANGE,
"Invalid change in CheckpointType requested" },
+ { ESLURM_INVALID_CRYPTO_TYPE_CHANGE,
+ "Invalid change in CryptoType requested" },
{ ESLURM_INVALID_SCHEDTYPE_CHANGE,
"Invalid change in SchedulerType requested" },
{ ESLURM_INVALID_SELECTTYPE_CHANGE,
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index b282b18bb83..bf0fb2aec39 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -243,6 +243,21 @@ char *slurm_get_auth_type(void)
return auth_type;
}
+/* slurm_get_crypto_type
+ * returns the crypto_type from slurmctld_conf object
+ * RET char * - crypto type, MUST be xfreed by caller
+ */
+extern char *slurm_get_crypto_type(void)
+{
+ char *crypto_type;
+ slurm_ctl_conf_t *conf;
+
+ conf = slurm_conf_lock();
+ crypto_type = xstrdup(conf->crypto_type);
+ slurm_conf_unlock();
+ return crypto_type;
+}
+
/* slurm_get_propagate_prio_process
* return the PropagatePrioProcess flag from slurmctld_conf object
*/
diff --git a/src/common/slurm_protocol_api.h b/src/common/slurm_protocol_api.h
index 0230d19f8a5..488ecbd7e69 100644
--- a/src/common/slurm_protocol_api.h
+++ b/src/common/slurm_protocol_api.h
@@ -143,6 +143,12 @@ extern char *slurm_get_auth_type(void);
*/
extern int slurm_set_auth_type(char *auth_type);
+/* slurm_get_crypto_type
+ * returns the crypto_type from slurmctld_conf object
+ * RET char * - crypto type, MUST be xfreed by caller
+ */
+extern char *slurm_get_crypto_type(void);
+
/* slurm_get_fast_schedule
* returns the value of fast_schedule in slurmctld_conf object
*/
diff --git a/src/common/slurm_protocol_defs.c b/src/common/slurm_protocol_defs.c
index 7d9b74d4101..92bc93e0f37 100644
--- a/src/common/slurm_protocol_defs.c
+++ b/src/common/slurm_protocol_defs.c
@@ -850,6 +850,7 @@ void slurm_free_ctl_conf(slurm_ctl_conf_info_msg_t * config_ptr)
xfree(config_ptr->backup_controller);
xfree(config_ptr->control_addr);
xfree(config_ptr->control_machine);
+ xfree(config_ptr->crypto_type);
xfree(config_ptr->epilog);
xfree(config_ptr->job_acct_loc);
xfree(config_ptr->job_acct_type);
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index e5382b6f5ed..21e67566d8e 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -2109,6 +2109,7 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer)
packstr(build_ptr->checkpoint_type, buffer);
packstr(build_ptr->control_addr, buffer);
packstr(build_ptr->control_machine, buffer);
+ packstr(build_ptr->crypto_type, buffer);
packstr(build_ptr->epilog, buffer);
pack16(build_ptr->fast_schedule, buffer);
pack32(build_ptr->first_job_id, buffer);
@@ -2209,6 +2210,8 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
safe_unpackstr_xmalloc(&build_ptr->control_addr, &uint16_tmp, buffer);
safe_unpackstr_xmalloc(&build_ptr->control_machine, &uint16_tmp,
buffer);
+ safe_unpackstr_xmalloc(&build_ptr->crypto_type, &uint16_tmp,
+ buffer);
safe_unpackstr_xmalloc(&build_ptr->epilog, &uint16_tmp, buffer);
safe_unpack16(&build_ptr->fast_schedule, buffer);
safe_unpack32(&build_ptr->first_job_id, buffer);
@@ -2310,6 +2313,7 @@ unpack_error:
xfree(build_ptr->checkpoint_type);
xfree(build_ptr->control_addr);
xfree(build_ptr->control_machine);
+ xfree(build_ptr->crypto_type);
xfree(build_ptr->epilog);
xfree(build_ptr->job_acct_loc);
xfree(build_ptr->job_acct_type);
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index b576f66cce4..7d3bf00dba5 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = auth checkpoint database jobacct jobcomp mpi proctrack sched select switch task
+SUBDIRS = auth checkpoint crypto database jobacct jobcomp mpi proctrack sched select switch task
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 4b8277e0513..4030e722765 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -118,6 +118,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -236,7 +237,7 @@ target_os = @target_os@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = auth checkpoint database jobacct jobcomp mpi proctrack sched select switch task
+SUBDIRS = auth checkpoint crypto database jobacct jobcomp mpi proctrack sched select switch task
all: all-recursive
.SUFFIXES:
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index a7b76c57101..3099e5e96d7 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index 6fd45a3f840..888faa8814c 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -139,6 +139,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index 77cc9fe7001..f070548734c 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -140,6 +140,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index e0647834945..c7c94ac7038 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index 66e79201ca1..40b71699f09 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index 34634d64538..8164a0d4079 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -143,6 +143,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index 728790b548f..6156185008a 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/crypto/Makefile.am b/src/plugins/crypto/Makefile.am
new file mode 100644
index 00000000000..fb4bb8a467b
--- /dev/null
+++ b/src/plugins/crypto/Makefile.am
@@ -0,0 +1,3 @@
+# Makefile for crypto plugins
+
+SUBDIRS = openssl
diff --git a/src/plugins/crypto/Makefile.in b/src/plugins/crypto/Makefile.in
new file mode 100644
index 00000000000..3ffea881f02
--- /dev/null
+++ b/src/plugins/crypto/Makefile.in
@@ -0,0 +1,558 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Makefile for crypto plugins
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/crypto
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
+ $(top_srcdir)/auxdir/slurm.m4 \
+ $(top_srcdir)/auxdir/x_ac__system_configuration.m4 \
+ $(top_srcdir)/auxdir/x_ac_affinity.m4 \
+ $(top_srcdir)/auxdir/x_ac_aix.m4 \
+ $(top_srcdir)/auxdir/x_ac_bluegene.m4 \
+ $(top_srcdir)/auxdir/x_ac_databases.m4 \
+ $(top_srcdir)/auxdir/x_ac_debug.m4 \
+ $(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_federation.m4 \
+ $(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
+ $(top_srcdir)/auxdir/x_ac_gtk.m4 \
+ $(top_srcdir)/auxdir/x_ac_munge.m4 \
+ $(top_srcdir)/auxdir/x_ac_ncurses.m4 \
+ $(top_srcdir)/auxdir/x_ac_pam.m4 \
+ $(top_srcdir)/auxdir/x_ac_ptrace.m4 \
+ $(top_srcdir)/auxdir/x_ac_readline.m4 \
+ $(top_srcdir)/auxdir/x_ac_setpgrp.m4 \
+ $(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
+ $(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
+ $(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/slurm/slurm.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTHD_CFLAGS = @AUTHD_CFLAGS@
+AUTHD_LIBS = @AUTHD_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BG_INCLUDES = @BG_INCLUDES@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CMD_LDFLAGS = @CMD_LDFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ELAN_LIBS = @ELAN_LIBS@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+HAVEPGCONFIG = @HAVEPGCONFIG@
+HAVEPKGCONFIG = @HAVEPKGCONFIG@
+HAVE_AIX = @HAVE_AIX@
+HAVE_ELAN = @HAVE_ELAN@
+HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
+HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_LDFLAGS = @LIB_LDFLAGS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
+MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
+MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_LIBS = @MYSQL_LIBS@
+NCURSES = @NCURSES@
+NUMA_LIBS = @NUMA_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PAM_LIBS = @PAM_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PGSQL_CFLAGS = @PGSQL_CFLAGS@
+PGSQL_LIBS = @PGSQL_LIBS@
+PLPA_LIBS = @PLPA_LIBS@
+PROCTRACKDIR = @PROCTRACKDIR@
+PROJECT = @PROJECT@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
+RELEASE = @RELEASE@
+SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
+SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SLURMCTLD_PORT = @SLURMCTLD_PORT@
+SLURMD_PORT = @SLURMD_PORT@
+SLURM_API_AGE = @SLURM_API_AGE@
+SLURM_API_CURRENT = @SLURM_API_CURRENT@
+SLURM_API_MAJOR = @SLURM_API_MAJOR@
+SLURM_API_REVISION = @SLURM_API_REVISION@
+SLURM_API_VERSION = @SLURM_API_VERSION@
+SLURM_MAJOR = @SLURM_MAJOR@
+SLURM_MICRO = @SLURM_MICRO@
+SLURM_MINOR = @SLURM_MINOR@
+SLURM_VERSION = @SLURM_VERSION@
+SO_LDFLAGS = @SO_LDFLAGS@
+SSL_CPPFLAGS = @SSL_CPPFLAGS@
+SSL_LDFLAGS = @SSL_LDFLAGS@
+SSL_LIBS = @SSL_LIBS@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = openssl
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/crypto/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/plugins/crypto/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/crypto/openssl/Makefile.am b/src/plugins/crypto/openssl/Makefile.am
new file mode 100644
index 00000000000..16816adf5d8
--- /dev/null
+++ b/src/plugins/crypto/openssl/Makefile.am
@@ -0,0 +1,32 @@
+# Makefile for crypto/openssl plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+if HAVE_OPENSSL
+openssl_lib = crypto_openssl.la
+else
+openssl_lib =
+endif
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
+
+pkglib_LTLIBRARIES = $(openssl_lib)
+
+if HAVE_OPENSSL
+crypto_openssl_la_SOURCES = \
+ crypto_openssl.c
+
+# Add libslurm to switch_elan to provide some symbols that are not
+# available in slurmctld (slurm_setenvpf)
+
+crypto_openssl_la_LIBADD = $(OPEN_LIBS) \
+ $(top_builddir)/src/api/libslurm.la
+
+crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+
+else
+EXTRA_crypto_openssl_la_SOURCES = \
+ crypto_openssl.c
+endif
diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in
new file mode 100644
index 00000000000..dc166f3e7f3
--- /dev/null
+++ b/src/plugins/crypto/openssl/Makefile.in
@@ -0,0 +1,565 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Makefile for crypto/openssl plugin
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/crypto/openssl
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
+ $(top_srcdir)/auxdir/slurm.m4 \
+ $(top_srcdir)/auxdir/x_ac__system_configuration.m4 \
+ $(top_srcdir)/auxdir/x_ac_affinity.m4 \
+ $(top_srcdir)/auxdir/x_ac_aix.m4 \
+ $(top_srcdir)/auxdir/x_ac_bluegene.m4 \
+ $(top_srcdir)/auxdir/x_ac_databases.m4 \
+ $(top_srcdir)/auxdir/x_ac_debug.m4 \
+ $(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_federation.m4 \
+ $(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
+ $(top_srcdir)/auxdir/x_ac_gtk.m4 \
+ $(top_srcdir)/auxdir/x_ac_munge.m4 \
+ $(top_srcdir)/auxdir/x_ac_ncurses.m4 \
+ $(top_srcdir)/auxdir/x_ac_pam.m4 \
+ $(top_srcdir)/auxdir/x_ac_ptrace.m4 \
+ $(top_srcdir)/auxdir/x_ac_readline.m4 \
+ $(top_srcdir)/auxdir/x_ac_setpgrp.m4 \
+ $(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
+ $(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
+ $(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/slurm/slurm.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+@HAVE_OPENSSL_TRUE@crypto_openssl_la_DEPENDENCIES = \
+@HAVE_OPENSSL_TRUE@ $(top_builddir)/src/api/libslurm.la
+am__crypto_openssl_la_SOURCES_DIST = crypto_openssl.c
+@HAVE_OPENSSL_TRUE@am_crypto_openssl_la_OBJECTS = crypto_openssl.lo
+am__EXTRA_crypto_openssl_la_SOURCES_DIST = crypto_openssl.c
+crypto_openssl_la_OBJECTS = $(am_crypto_openssl_la_OBJECTS)
+crypto_openssl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(crypto_openssl_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_OPENSSL_TRUE@am_crypto_openssl_la_rpath = -rpath $(pkglibdir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/slurm@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+SOURCES = $(crypto_openssl_la_SOURCES) \
+ $(EXTRA_crypto_openssl_la_SOURCES)
+DIST_SOURCES = $(am__crypto_openssl_la_SOURCES_DIST) \
+ $(am__EXTRA_crypto_openssl_la_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTHD_CFLAGS = @AUTHD_CFLAGS@
+AUTHD_LIBS = @AUTHD_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BG_INCLUDES = @BG_INCLUDES@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CMD_LDFLAGS = @CMD_LDFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ELAN_LIBS = @ELAN_LIBS@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+HAVEPGCONFIG = @HAVEPGCONFIG@
+HAVEPKGCONFIG = @HAVEPKGCONFIG@
+HAVE_AIX = @HAVE_AIX@
+HAVE_ELAN = @HAVE_ELAN@
+HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
+HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_LDFLAGS = @LIB_LDFLAGS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
+MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
+MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_LIBS = @MYSQL_LIBS@
+NCURSES = @NCURSES@
+NUMA_LIBS = @NUMA_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PAM_LIBS = @PAM_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PGSQL_CFLAGS = @PGSQL_CFLAGS@
+PGSQL_LIBS = @PGSQL_LIBS@
+PLPA_LIBS = @PLPA_LIBS@
+PROCTRACKDIR = @PROCTRACKDIR@
+PROJECT = @PROJECT@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
+RELEASE = @RELEASE@
+SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
+SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SLURMCTLD_PORT = @SLURMCTLD_PORT@
+SLURMD_PORT = @SLURMD_PORT@
+SLURM_API_AGE = @SLURM_API_AGE@
+SLURM_API_CURRENT = @SLURM_API_CURRENT@
+SLURM_API_MAJOR = @SLURM_API_MAJOR@
+SLURM_API_REVISION = @SLURM_API_REVISION@
+SLURM_API_VERSION = @SLURM_API_VERSION@
+SLURM_MAJOR = @SLURM_MAJOR@
+SLURM_MICRO = @SLURM_MICRO@
+SLURM_MINOR = @SLURM_MINOR@
+SLURM_VERSION = @SLURM_VERSION@
+SO_LDFLAGS = @SO_LDFLAGS@
+SSL_CPPFLAGS = @SSL_CPPFLAGS@
+SSL_LDFLAGS = @SSL_LDFLAGS@
+SSL_LIBS = @SSL_LIBS@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign
+@HAVE_OPENSSL_FALSE@openssl_lib =
+@HAVE_OPENSSL_TRUE@openssl_lib = crypto_openssl.la
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
+pkglib_LTLIBRARIES = $(openssl_lib)
+@HAVE_OPENSSL_TRUE@crypto_openssl_la_SOURCES = \
+@HAVE_OPENSSL_TRUE@ crypto_openssl.c
+
+
+# Add libslurm to switch_elan to provide some symbols that are not
+# available in slurmctld (slurm_setenvpf)
+@HAVE_OPENSSL_TRUE@crypto_openssl_la_LIBADD = $(OPEN_LIBS) \
+@HAVE_OPENSSL_TRUE@ $(top_builddir)/src/api/libslurm.la
+
+@HAVE_OPENSSL_TRUE@crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+@HAVE_OPENSSL_FALSE@EXTRA_crypto_openssl_la_SOURCES = \
+@HAVE_OPENSSL_FALSE@ crypto_openssl.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/crypto/openssl/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/plugins/crypto/openssl/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-pkglibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
+ done
+
+clean-pkglibLTLIBRARIES:
+ -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+crypto_openssl.la: $(crypto_openssl_la_OBJECTS) $(crypto_openssl_la_DEPENDENCIES)
+ $(crypto_openssl_la_LINK) $(am_crypto_openssl_la_rpath) $(crypto_openssl_la_OBJECTS) $(crypto_openssl_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypto_openssl.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+ for dir in "$(DESTDIR)$(pkglibdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-exec-am: install-pkglibLTLIBRARIES
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkglibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkglibLTLIBRARIES \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/crypto/openssl/crypto_openssl.c b/src/plugins/crypto/openssl/crypto_openssl.c
new file mode 100644
index 00000000000..6fddf8c1c66
--- /dev/null
+++ b/src/plugins/crypto/openssl/crypto_openssl.c
@@ -0,0 +1,228 @@
+/*****************************************************************************\
+ * crypto_openssl.c - OpenSSL based cryptographic signature plugin
+ *****************************************************************************
+ * Copyright (C) 2007 The Regents of the University of California.
+ * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ * Written by Mark A. Grondona <mgrondona@llnl.gov>.
+ * UCRL-CODE-226842.
+ *
+ * This file is part of SLURM, a resource management program.
+ * For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ * SLURM is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * In addition, as a special exception, the copyright holders give permission
+ * to link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two. You must obey the GNU
+ * General Public License in all respects for all of the code used other than
+ * OpenSSL. If you modify file(s) with this exception, you may extend this
+ * exception to your version of the file(s), but you are not obligated to do
+ * so. If you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files in
+ * the program, then also delete it here.
+ *
+ * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with SLURM; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+\*****************************************************************************/
+
+#if HAVE_CONFIG_H
+# include "config.h"
+# if HAVE_INTTYPES_H
+# include <inttypes.h>
+# else /* ! HAVE_INTTYPES_H */
+# if HAVE_STDINT_H
+# include <stdint.h>
+# endif
+# endif /* HAVE_INTTYPES_H */
+#else /* ! HAVE_CONFIG_H */
+# include <stdint.h>
+#endif /* HAVE_CONFIG_H */
+
+#include <stdio.h>
+
+/*
+ * OpenSSL includes
+ */
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/err.h>
+
+#include <slurm/slurm_errno.h>
+#include "src/common/xassert.h"
+#include "src/common/xmalloc.h"
+
+/*
+ * These variables are required by the generic plugin interface. If they
+ * are not found in the plugin, the plugin loader will ignore it.
+ *
+ * plugin_name - a string giving a human-readable description of the
+ * plugin. There is no maximum length, but the symbol must refer to
+ * a valid string.
+ *
+ * plugin_type - a string suggesting the type of the plugin or its
+ * applicability to a particular form of data or method of data handling.
+ * If the low-level plugin API is used, the contents of this string are
+ * unimportant and may be anything. SLURM uses the higher-level plugin
+ * interface which requires this string to be of the form
+ *
+ * <application>/<method>
+ *
+ * where <application> is a description of the intended application of
+ * the plugin (e.g., "auth" for SLURM authentication) and <method> is a
+ * description of how this plugin satisfies that application. SLURM will
+ * only load authentication plugins if the plugin_type string has a prefix
+ * of "auth/".
+ *
+ * plugin_version - an unsigned 32-bit integer giving the version number
+ * of the plugin. If major and minor revisions are desired, the major
+ * version number may be multiplied by a suitable magnitude constant such
+ * as 100 or 1000. Various SLURM versions will likely require a certain
+ * minimum versions for their plugins as the authentication API matures.
+ */
+const char plugin_name[] = "OpenSSL cryptographic signature plugin";
+const char plugin_type[] = "crypto/openssl";
+const uint32_t plugin_version = 90;
+
+/*
+ * init() is called when the plugin is loaded, before any other functions
+ * are called. Put global initialization here.
+ */
+extern int init ( void )
+{
+ verbose("%s loaded", plugin_name);
+ return SLURM_SUCCESS;
+}
+
+/*
+ * fini() is called when the plugin is unloaded,
+ * free any global memory allocations here to avoid memory leaks.
+ */
+extern int fini ( void )
+{
+ verbose("%s unloaded", plugin_name);
+ return SLURM_SUCCESS;
+}
+
+extern void
+crypto_destroy_key(void *key)
+{
+ if (key)
+ EVP_PKEY_free((EVP_PKEY *) key);
+}
+
+extern void *
+crypto_read_private_key(const char *path)
+{
+ FILE *fp = NULL;
+ EVP_PKEY *pk = NULL;
+
+ xassert(path != NULL);
+
+ if (!(fp = fopen(path, "r")))
+ return NULL;
+
+ if (!PEM_read_PrivateKey(fp, &pk, NULL, NULL)) {
+ fclose(fp);
+ return NULL;
+ }
+ fclose(fp);
+
+ return (void *) pk;
+}
+
+
+extern void *
+crypto_read_public_key(const char *path)
+{
+ FILE *fp = NULL;
+ EVP_PKEY *pk = NULL;
+
+ xassert(path != NULL);
+
+ if ((fp = fopen(path, "r")) == NULL)
+ return NULL;
+
+ if (!PEM_read_PUBKEY(fp, &pk, NULL, NULL)) {
+ fclose(fp);
+ return NULL;
+ }
+ fclose(fp);
+
+ return (void *) pk;
+}
+
+extern char *
+crypto_str_error(void)
+{
+ static int loaded = 0;
+
+ if (loaded == 0) {
+ ERR_load_crypto_strings();
+ loaded = 1;
+ }
+
+ return (char *) ERR_reason_error_string(ERR_get_error());
+}
+
+/* NOTE: Caller must xfree the signature returned by sig_pp */
+extern int
+crypto_sign(void * key, char *buffer, int buf_size, char **sig_pp,
+ unsigned int *sig_size_p)
+{
+ EVP_MD_CTX ectx;
+ int rc = SLURM_SUCCESS;
+ int ksize = EVP_PKEY_size((EVP_PKEY *) key);
+
+ /*
+ * Allocate memory for signature: at most EVP_PKEY_size() bytes
+ */
+ *sig_pp = xmalloc(ksize * sizeof(unsigned char));
+
+ EVP_SignInit(&ectx, EVP_sha1());
+ EVP_SignUpdate(&ectx, buffer, buf_size);
+
+ if (!(EVP_SignFinal(&ectx, (unsigned char *)*sig_pp, sig_size_p,
+ (EVP_PKEY *) key))) {
+ rc = SLURM_ERROR;
+ }
+
+#ifdef HAVE_EVP_MD_CTX_CLEANUP
+ /* Note: Likely memory leak if this function is absent */
+ EVP_MD_CTX_cleanup(&ectx);
+#endif
+
+ return rc;
+}
+
+extern int
+crypto_verify_sign(void * key, char *buffer, unsigned int buf_size,
+ char *signature, int sig_size)
+{
+ EVP_MD_CTX ectx;
+ int rc = SLURM_SUCCESS;
+
+ EVP_VerifyInit(&ectx, EVP_sha1());
+ EVP_VerifyUpdate(&ectx, buffer, buf_size);
+
+ rc = EVP_VerifyFinal(&ectx, (unsigned char *) signature,
+ sig_size, (EVP_PKEY *) key);
+ if (!rc)
+ rc = SLURM_ERROR;
+
+#ifdef HAVE_EVP_MD_CTX_CLEANUP
+ /* Note: Likely memory leak if this function is absent */
+ EVP_MD_CTX_cleanup(&ectx);
+#endif
+
+ return rc;
+}
diff --git a/src/plugins/database/Makefile.in b/src/plugins/database/Makefile.in
index a536a7ad87e..5763043e65d 100644
--- a/src/plugins/database/Makefile.in
+++ b/src/plugins/database/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/database/flatfile/Makefile.in b/src/plugins/database/flatfile/Makefile.in
index 4288e2a4e73..d0cb2b5cc13 100644
--- a/src/plugins/database/flatfile/Makefile.in
+++ b/src/plugins/database/flatfile/Makefile.in
@@ -141,6 +141,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/database/mysql/Makefile.in b/src/plugins/database/mysql/Makefile.in
index 98072357a77..a59eca4cb57 100644
--- a/src/plugins/database/mysql/Makefile.in
+++ b/src/plugins/database/mysql/Makefile.in
@@ -141,6 +141,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/database/pgsql/Makefile.in b/src/plugins/database/pgsql/Makefile.in
index bfa77dd25e6..0cede517043 100644
--- a/src/plugins/database/pgsql/Makefile.in
+++ b/src/plugins/database/pgsql/Makefile.in
@@ -141,6 +141,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/jobacct/Makefile.in b/src/plugins/jobacct/Makefile.in
index 3c7b554aa37..27960099791 100644
--- a/src/plugins/jobacct/Makefile.in
+++ b/src/plugins/jobacct/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/jobacct/aix/Makefile.in b/src/plugins/jobacct/aix/Makefile.in
index 51b2b8cd82f..d37e8e35f58 100644
--- a/src/plugins/jobacct/aix/Makefile.in
+++ b/src/plugins/jobacct/aix/Makefile.in
@@ -139,6 +139,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/jobacct/linux/Makefile.in b/src/plugins/jobacct/linux/Makefile.in
index b896140db23..d0a57756580 100644
--- a/src/plugins/jobacct/linux/Makefile.in
+++ b/src/plugins/jobacct/linux/Makefile.in
@@ -140,6 +140,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/jobacct/none/Makefile.in b/src/plugins/jobacct/none/Makefile.in
index f033ad5d075..b7ea2718149 100644
--- a/src/plugins/jobacct/none/Makefile.in
+++ b/src/plugins/jobacct/none/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index 3f0c2468bc7..5523495f9cf 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/jobcomp/database/Makefile.in b/src/plugins/jobcomp/database/Makefile.in
index 4a8a0da57fe..fabbfe28369 100644
--- a/src/plugins/jobcomp/database/Makefile.in
+++ b/src/plugins/jobcomp/database/Makefile.in
@@ -137,6 +137,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index 715dda7ca9f..18e8109914d 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index 29427817da5..c8845e4f21c 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 160a215439c..50c67249674 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index f71c902e50d..b07b66dca11 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index fbe4e9d9bcc..19746dcdc0d 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/mpi/mpich1_p4/Makefile.in b/src/plugins/mpi/mpich1_p4/Makefile.in
index 79be2dc800c..8751fe5a15b 100644
--- a/src/plugins/mpi/mpich1_p4/Makefile.in
+++ b/src/plugins/mpi/mpich1_p4/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.in b/src/plugins/mpi/mpich1_shmem/Makefile.in
index 8e70105adef..cd8c5eccbe2 100644
--- a/src/plugins/mpi/mpich1_shmem/Makefile.in
+++ b/src/plugins/mpi/mpich1_shmem/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index 7959df142ab..474780fc6da 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index 3243b4d2de3..f242d2766d9 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index bdc81de71e0..9ee48d99f77 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/mpi/openmpi/Makefile.in b/src/plugins/mpi/openmpi/Makefile.in
index cb60d3e7e38..28cd748ed4a 100644
--- a/src/plugins/mpi/openmpi/Makefile.in
+++ b/src/plugins/mpi/openmpi/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index 053fcd5e5b9..311aad5dc3f 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index b28be8b3f22..34f517798a0 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index 26786537b26..935c0fa28ff 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -139,6 +139,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index bce33403589..fa31f22b4c5 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/proctrack/rms/Makefile.in b/src/plugins/proctrack/rms/Makefile.in
index 45d56fae04d..c3f3327498f 100644
--- a/src/plugins/proctrack/rms/Makefile.in
+++ b/src/plugins/proctrack/rms/Makefile.in
@@ -139,6 +139,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index 1dc496c3039..05f2cae0e37 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index b08e6408283..73a1bf1b2ed 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index 845df32cc69..6cd8b89a9c2 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index fd6134a22b7..9d895dbbcd7 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/sched/gang/Makefile.in b/src/plugins/sched/gang/Makefile.in
index a4675b83034..9d5a12bd5a8 100644
--- a/src/plugins/sched/gang/Makefile.in
+++ b/src/plugins/sched/gang/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index ecfcce7e660..10aa5adfadc 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/sched/wiki/Makefile.in b/src/plugins/sched/wiki/Makefile.in
index 87729c9eaa2..261b4a6f496 100644
--- a/src/plugins/sched/wiki/Makefile.in
+++ b/src/plugins/sched/wiki/Makefile.in
@@ -139,6 +139,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/sched/wiki2/Makefile.in b/src/plugins/sched/wiki2/Makefile.in
index e70dde31a1e..bf078d881ab 100644
--- a/src/plugins/sched/wiki2/Makefile.in
+++ b/src/plugins/sched/wiki2/Makefile.in
@@ -142,6 +142,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index ea67c641d38..3b406548f8c 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 2d05d0b0097..d8c2e9710bc 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.in b/src/plugins/select/bluegene/block_allocator/Makefile.in
index ef6c00222a3..2892d8ad238 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.in
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.in
@@ -132,6 +132,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/select/bluegene/plugin/Makefile.in b/src/plugins/select/bluegene/plugin/Makefile.in
index 58f3bf597c4..a93c5e5ade4 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.in
+++ b/src/plugins/select/bluegene/plugin/Makefile.in
@@ -178,6 +178,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index 30cdb482def..54195c91631 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -139,6 +139,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index 2f8fb49ebae..e8be013075f 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -139,6 +139,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index b20356e7282..bf13f075e0e 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/switch/elan/Makefile.in b/src/plugins/switch/elan/Makefile.in
index b16017d44a4..1f4ef48ee8f 100644
--- a/src/plugins/switch/elan/Makefile.in
+++ b/src/plugins/switch/elan/Makefile.in
@@ -144,6 +144,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
index 8515cf31b0c..c6617f95cd2 100644
--- a/src/plugins/switch/federation/Makefile.in
+++ b/src/plugins/switch/federation/Makefile.in
@@ -148,6 +148,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index 75214f0b8de..f618ee2020b 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -139,6 +139,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index 90d1dceea34..e6de8c45db4 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -120,6 +120,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index 52b497c532c..b12a2ab7060 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -150,6 +150,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index d20986fc862..235d3d11cc1 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -139,6 +139,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index 3ec3a5a665d..50934b87384 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -137,6 +137,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in
index aec781044a9..a3800eff1ad 100644
--- a/src/salloc/Makefile.in
+++ b/src/salloc/Makefile.in
@@ -133,6 +133,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in
index 54b39401ecc..083ea47c1fb 100644
--- a/src/sattach/Makefile.in
+++ b/src/sattach/Makefile.in
@@ -134,6 +134,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in
index 7f61ff3df28..b4f6e1d77e7 100644
--- a/src/sbatch/Makefile.in
+++ b/src/sbatch/Makefile.in
@@ -133,6 +133,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index 0de31ccc01b..87e10db7872 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -137,6 +137,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index 3d2d7a5f6bf..6cf89a987b5 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -136,6 +136,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index 1b5308cc2af..89d2f93f9fb 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -136,6 +136,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index 91fa06c3376..5706e1d3efb 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/slaunch/Makefile.in b/src/slaunch/Makefile.in
index c0f4f7ffab0..d68ac077257 100644
--- a/src/slaunch/Makefile.in
+++ b/src/slaunch/Makefile.in
@@ -136,6 +136,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index 8c6f6c2161d..5c57787e007 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -141,6 +141,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 3147a1e52ef..c0d42f1ffcd 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -423,6 +423,7 @@ int main(int argc, char *argv[])
/* purge remaining data structures */
slurm_cred_ctx_destroy(slurmctld_config.cred_ctx);
+ slurm_crypto_fini(); /* must be after ctx_destroy */
slurm_conf_destroy();
slurm_api_clear_config();
sleep(2);
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index ab3947064cf..396a7e3dd16 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -310,6 +310,7 @@ void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr)
conf_ptr->checkpoint_type = xstrdup(conf->checkpoint_type);
conf_ptr->control_addr = xstrdup(conf->control_addr);
conf_ptr->control_machine = xstrdup(conf->control_machine);
+ conf_ptr->crypto_type = xstrdup(conf->crypto_type);
conf_ptr->epilog = xstrdup(conf->epilog);
conf_ptr->fast_schedule = conf->fast_schedule;
conf_ptr->first_job_id = conf->first_job_id;
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index 9f5c3dd988d..0de5406d068 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -82,8 +82,8 @@ static int _preserve_select_type_param(slurm_ctl_conf_t * ctl_conf_ptr,
select_type_plugin_info_t old_select_type_p);
static int _preserve_plugins(slurm_ctl_conf_t * ctl_conf_ptr,
char *old_auth_type, char *old_checkpoint_type,
- char *old_sched_type, char *old_select_type,
- char *old_switch_type);
+ char *old_crypto_type, char *old_sched_type,
+ char *old_select_type, char *old_switch_type);
static int _sync_nodes_to_comp_job(void);
static int _sync_nodes_to_jobs(void);
static int _sync_nodes_to_active_job(struct job_record *job_ptr);
@@ -689,6 +689,7 @@ int read_slurm_conf(int recover)
struct node_record *old_node_table_ptr;
char *old_auth_type = xstrdup(slurmctld_conf.authtype);
char *old_checkpoint_type = xstrdup(slurmctld_conf.checkpoint_type);
+ char *old_crypto_type = xstrdup(slurmctld_conf.crypto_type);
char *old_sched_type = xstrdup(slurmctld_conf.schedtype);
char *old_select_type = xstrdup(slurmctld_conf.select_type);
char *old_switch_type = xstrdup(slurmctld_conf.switch_type);
@@ -797,8 +798,10 @@ int read_slurm_conf(int recover)
/* Update plugins as possible */
error_code = _preserve_plugins(&slurmctld_conf,
old_auth_type, old_checkpoint_type,
- old_sched_type, old_select_type,
- old_switch_type);
+ old_crypto_type, old_sched_type,
+ old_select_type, old_switch_type);
+ if (error_code)
+ return error_code;
/* Update plugin parameters as possible */
error_code = _preserve_select_type_param(
@@ -905,8 +908,8 @@ static int _preserve_select_type_param(slurm_ctl_conf_t *ctl_conf_ptr,
*/
static int _preserve_plugins(slurm_ctl_conf_t * ctl_conf_ptr,
char *old_auth_type, char *old_checkpoint_type,
- char *old_sched_type, char *old_select_type,
- char *old_switch_type)
+ char *old_crypto_type, char *old_sched_type,
+ char *old_select_type, char *old_switch_type)
{
int rc = SLURM_SUCCESS;
@@ -929,6 +932,16 @@ static int _preserve_plugins(slurm_ctl_conf_t * ctl_conf_ptr,
xfree(old_checkpoint_type);
}
+ if (old_crypto_type) {
+ if (strcmp(old_crypto_type,
+ ctl_conf_ptr->crypto_type)) {
+ xfree(ctl_conf_ptr->crypto_type);
+ ctl_conf_ptr->crypto_type = old_crypto_type;
+ rc = ESLURM_INVALID_CRYPTO_TYPE_CHANGE;
+ } else
+ xfree(old_crypto_type);
+ }
+
if (old_sched_type) {
if (strcmp(old_sched_type, ctl_conf_ptr->schedtype)) {
xfree(ctl_conf_ptr->schedtype);
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index cea8a893292..c17ffb0f6bc 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -118,6 +118,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index 8ca8b775629..b7136bae1d3 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -154,6 +154,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index 105060f8e91..497d4371852 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -1027,6 +1027,7 @@ _slurmd_fini()
slurm_conf_destroy();
slurm_proctrack_fini();
slurm_auth_fini();
+ slurm_crypto_fini();
slurmd_req(NULL); /* purge memory allocated by slurmd_req() */
return SLURM_SUCCESS;
}
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index 1444c50b814..e7ff2322335 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -145,6 +145,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index 100fd8eadd1..bca8a24c9c2 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -151,6 +151,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index 4d3b58a7626..d3b4122cb39 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index ae6d1f78c9a..fb56f862113 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -137,6 +137,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/strigger/Makefile.in b/src/strigger/Makefile.in
index 7e75419f78c..3760d893d1e 100644
--- a/src/strigger/Makefile.in
+++ b/src/strigger/Makefile.in
@@ -137,6 +137,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in
index 697cb2bf3f8..7d1e40962a5 100644
--- a/src/sview/Makefile.in
+++ b/src/sview/Makefile.in
@@ -155,6 +155,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index e05f141c244..d7ac89861f8 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -125,6 +125,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index 619309f619a..63bfb56fdd7 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -106,6 +106,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/testsuite/expect/test7.9 b/testsuite/expect/test7.9
index f8eb960b252..67378b6c485 100755
--- a/testsuite/expect/test7.9
+++ b/testsuite/expect/test7.9
@@ -102,6 +102,7 @@ make_bash_script $file_in "
for ((i=0; i<$iterations; i++)) ; do
$srun $file_prog
done
+ $bin_echo 'fini'
"
set job_id 0
@@ -134,6 +135,7 @@ if {[wait_for_job $job_id "DONE"] != 0} {
if {[wait_for_file $file_out] != 0} {
exit 1
}
+set fini 0
set matches 0
spawn $bin_cat $file_out
expect {
@@ -141,6 +143,10 @@ expect {
incr matches
exp_continue
}
+ -re "fini" {
+ set fini 1
+ exp_continue
+ }
timeout {
send_user "\nFAILURE: /bin/cat not responding\n"
set exit_code 1
@@ -149,6 +155,10 @@ expect {
wait
}
}
+if {$fini != 1} {
+ send_user "\nFAILURE: script never completed\n"
+ set exit_code 1
+}
if {$matches != 0} {
set tot [expr $iterations + 1]
if {$matches <= 1} {
diff --git a/testsuite/expect/test7.9.prog.c b/testsuite/expect/test7.9.prog.c
index 11e844c781b..5ecb3d82409 100644
--- a/testsuite/expect/test7.9.prog.c
+++ b/testsuite/expect/test7.9.prog.c
@@ -32,7 +32,8 @@
#include <time.h>
#include <unistd.h>
-#define _DEBUG 0
+#define _DEBUG 0
+#define _EXTREME_DEBUG 0
main (int argc, char **argv)
{
@@ -51,16 +52,17 @@ main (int argc, char **argv)
printf("FAILED: File descriptor %d is open\n", i);
#if _DEBUG
{
- char data[64];
- int j;
- size_t data_size;
-
printf(" st_mode: 0%o\n",(int) buf.st_mode);
printf(" st_uid: %d\n", (int) buf.st_uid);
printf(" st_gid: %d\n", (int) buf.st_gid);
printf(" st_size: %d\n", (int) buf.st_size);
printf(" st_ino: %d\n", (int) buf.st_ino);
printf(" st_dev: %d\n", (int) buf.st_dev);
+#if _EXTREME_DEBUG
+ {
+ char data[64];
+ int j;
+ size_t data_size;
lseek(i, 0, SEEK_SET);
data_size = read(i, data, 64);
@@ -71,6 +73,8 @@ main (int argc, char **argv)
for (j=0; j<data_size; j++)
printf(" data[%d]:0x%x\n", j, data[j]);
}
+ }
+#endif
}
#endif
}
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index c171748382e..3862206062e 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -118,6 +118,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index 299d05d4b3b..4d1a4d49b25 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -138,6 +138,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index 8d8602b2aa7..9c077286c33 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -160,6 +160,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index e87462272bd..1666714de9a 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -146,6 +146,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/testsuite/slurm_unit/slurmctld/Makefile.in b/testsuite/slurm_unit/slurmctld/Makefile.in
index 581094c00c6..3847ee1f416 100644
--- a/testsuite/slurm_unit/slurmctld/Makefile.in
+++ b/testsuite/slurm_unit/slurmctld/Makefile.in
@@ -109,6 +109,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
diff --git a/testsuite/slurm_unit/slurmd/Makefile.in b/testsuite/slurm_unit/slurmd/Makefile.in
index 8c4cd85dcd3..9e350b27016 100644
--- a/testsuite/slurm_unit/slurmd/Makefile.in
+++ b/testsuite/slurm_unit/slurmd/Makefile.in
@@ -109,6 +109,7 @@ HAVEPKGCONFIG = @HAVEPKGCONFIG@
HAVE_AIX = @HAVE_AIX@
HAVE_ELAN = @HAVE_ELAN@
HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_OPENSSL = @HAVE_OPENSSL@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
--
GitLab