6658263 ipseckey and ikeadm don't print ASN.1 ID values

4 files changed, 267 insertions, 5 deletions

diff --git a/usr/src/lib/libipsecutil/common/ipsec_libssl_setup.c b/usr/src/lib/libipsecutil/common/ipsec_libssl_setup.c
new file mode 100644
index 0000000000..91a3d0c787
--- /dev/null
+++ b/usr/src/lib/libipsecutil/common/ipsec_libssl_setup.c
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * Thread setup portions of this code derived from
+ * OpenSSL 0.9.4 file mt/mttest.c examples
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <libintl.h>
+#include <synch.h>
+#include <thread.h>
+#include <dlfcn.h>
+#include <openssl/lhash.h>
+#include <openssl/crypto.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include "ipsec_util.h"
+
+/* OpenSSL function pointers */
+static X509_NAME *(*d2i_X509_NAME_fn)() = NULL;
+static int (*X509_NAME_print_ex_fp_fn)() = NULL;
+static char *(*ERR_get_error_fn)() = NULL;
+static char *(*ERR_error_string_fn)() = NULL;
+static void (*SSL_load_error_strings_fn)() = NULL;
+static void (*ERR_free_strings_fn)() = NULL;
+static void (*CRYPTO_set_locking_callback_fn)() = NULL;
+static void (*CRYPTO_set_id_callback_fn)() = NULL;
+
+static void solaris_locking_callback(int, int, char *, int);
+static unsigned long solaris_thread_id(void);
+static void thread_setup(void);
+/* LINTED E_STATIC_UNUSED */
+static void thread_cleanup(void);
+
+mutex_t init_lock = DEFAULTMUTEX;
+static mutex_t lock_cs[CRYPTO_NUM_LOCKS];
+static long lock_count[CRYPTO_NUM_LOCKS];
+
+void
+libssl_load()
+{
+	void *dldesc;
+
+	(void) mutex_lock(&init_lock);
+	if (libssl_loaded) {
+		(void) mutex_unlock(&init_lock);
+		return;
+	}
+
+	dldesc = dlopen(LIBSSL, RTLD_LAZY);
+	if (dldesc != NULL) {
+		d2i_X509_NAME_fn = (X509_NAME*(*)())dlsym(dldesc,
+		    "d2i_X509_NAME");
+		if (d2i_X509_NAME_fn == NULL)
+			goto libssl_err;
+
+		X509_NAME_print_ex_fp_fn = (int(*)())dlsym(dldesc,
+		    "X509_NAME_print_ex_fp");
+		if (X509_NAME_print_ex_fp_fn == NULL)
+			goto libssl_err;
+
+		ERR_get_error_fn = (char *(*)())dlsym(dldesc,
+		    "ERR_get_error");
+		if (ERR_get_error_fn == NULL)
+			goto libssl_err;
+
+		ERR_error_string_fn = (char *(*)())dlsym(dldesc,
+		    "ERR_error_string");
+		if (ERR_error_string_fn == NULL)
+			goto libssl_err;
+
+		SSL_load_error_strings_fn = (void(*)())dlsym(dldesc,
+		    "SSL_load_error_strings");
+		if (SSL_load_error_strings_fn == NULL)
+			goto libssl_err;
+
+		ERR_free_strings_fn = (void(*)())dlsym(dldesc,
+		    "ERR_free_strings");
+		if (ERR_free_strings_fn == NULL)
+			goto libssl_err;
+
+		CRYPTO_set_locking_callback_fn = (void(*)())dlsym(dldesc,
+		    "CRYPTO_set_locking_callback");
+		if (CRYPTO_set_locking_callback_fn == NULL)
+			goto libssl_err;
+
+		CRYPTO_set_id_callback_fn = (void(*)())dlsym(dldesc,
+		    "CRYPTO_set_id_callback");
+		if (CRYPTO_set_id_callback_fn == NULL)
+			goto libssl_err;
+
+		thread_setup();
+
+		libssl_loaded = B_TRUE;
+	}
+	(void) mutex_unlock(&init_lock);
+	return;
+libssl_err:
+	(void) dlclose(dldesc);
+	(void) mutex_unlock(&init_lock);
+}
+
+static void
+thread_setup(void)
+{
+	int i;
+
+	for (i = 0; i < CRYPTO_NUM_LOCKS; i++) {
+		lock_count[i] = 0;
+		(void) mutex_init(&(lock_cs[i]), USYNC_THREAD, NULL);
+	}
+
+	CRYPTO_set_id_callback_fn((unsigned long (*)())solaris_thread_id);
+	CRYPTO_set_locking_callback_fn((void (*)())solaris_locking_callback);
+}
+
+static void
+thread_cleanup(void)
+{
+	int i;
+
+	(void) mutex_lock(&init_lock);
+	CRYPTO_set_locking_callback_fn(NULL);
+	CRYPTO_set_id_callback_fn(NULL);
+	for (i = 0; i < CRYPTO_NUM_LOCKS; i++)
+		(void) mutex_destroy(&(lock_cs[i]));
+	(void) mutex_unlock(&init_lock);
+}
+
+/* ARGSUSED */
+static void
+solaris_locking_callback(int mode, int type, char *file, int line)
+{
+	if (mode & CRYPTO_LOCK) {
+		(void) mutex_lock(&(lock_cs[type]));
+		lock_count[type]++;
+	} else {
+		(void) mutex_unlock(&(lock_cs[type]));
+	}
+}
+
+static unsigned long
+solaris_thread_id(void)
+{
+	unsigned long ret;
+
+	ret = (unsigned long)thr_self();
+	return (ret);
+}
+
+void
+print_asn1_name(FILE *file, const unsigned char *buf, long buflen)
+{
+	libssl_load();
+
+	if (libssl_loaded) {
+		X509_NAME *x509 = NULL;
+		const unsigned char *p;
+
+		/* Make an effort to decode the ASN1 encoded name */
+		SSL_load_error_strings_fn();
+
+		/* temporary variable is mandatory per openssl docs */
+		p = buf;
+
+		x509 = d2i_X509_NAME_fn(NULL, &p, buflen);
+		if (x509 != NULL) {
+			(void) X509_NAME_print_ex_fp_fn(file, x509, 0,
+			    (ASN1_STRFLGS_RFC2253 | ASN1_STRFLGS_ESC_QUOTE |
+			    XN_FLAG_SEP_CPLUS_SPC | XN_FLAG_FN_SN));
+			(void) fprintf(file, "\n");
+		} else {
+			char errbuf[80];
+
+			(void) fprintf(file, "\n# %s\n",
+			    ERR_error_string_fn(ERR_get_error_fn(), errbuf));
+			(void) fprintf(file, dgettext(TEXT_DOMAIN,
+			    "<cannot interpret>\n"));
+		}
+		ERR_free_strings_fn();
+	} else {
+		(void) fprintf(file, dgettext(TEXT_DOMAIN, "<cannot print>\n"));
+	}
+}
diff --git a/usr/src/lib/libipsecutil/common/ipsec_util.c b/usr/src/lib/libipsecutil/common/ipsec_util.c
index 3e1e4b5503..58b3e39988 100644
--- a/usr/src/lib/libipsecutil/common/ipsec_util.c
+++ b/usr/src/lib/libipsecutil/common/ipsec_util.c
@@ -1,4 +1,5 @@
 /*
+ *
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
@@ -1841,10 +1842,12 @@ print_ident(FILE *file, char *prefix, struct sadb_ident *id)
 	    " identity, uid=%d, type "), id->sadb_ident_id);
 	canprint = dump_sadb_idtype(id->sadb_ident_type, file, NULL);
 	(void) fprintf(file, "\n%s", prefix);
-	if (canprint)
+	if (canprint) {
 		(void) fprintf(file, "%s\n", (char *)(id + 1));
-	else
-		(void) fprintf(file, dgettext(TEXT_DOMAIN, "<cannot print>\n"));
+	} else {
+		print_asn1_name(file, (const unsigned char *)(id + 1),
+		    SADB_64TO8(id->sadb_ident_len) - sizeof (sadb_ident_t));
+	}
 }
 
 /*
diff --git a/usr/src/lib/libipsecutil/common/ipsec_util.h b/usr/src/lib/libipsecutil/common/ipsec_util.h
index e9995cc6f8..00e16238a6 100644
--- a/usr/src/lib/libipsecutil/common/ipsec_util.h
+++ b/usr/src/lib/libipsecutil/common/ipsec_util.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -169,6 +169,13 @@ extern int dbgstr2num(char *);
 /* convert a string of debug strings with +|- delimiters to a debug level */
 extern int parsedbgopts(char *);
 
+/*
+ * OpenSSL library
+ */
+#define	LIBSSL	"libssl.so"
+
+void libssl_load(void);
+boolean_t libssl_loaded;
 
 /*
  * functions to manipulate the kmcookie-label mapping file
@@ -322,6 +329,7 @@ extern void printsatime(FILE *, int64_t, const char *, const char *,
 extern void print_lifetimes(FILE *, time_t, struct sadb_lifetime *,
     struct sadb_lifetime *, struct sadb_lifetime *, boolean_t vflag);
 extern void print_address(FILE *, char *, struct sadb_address *, boolean_t);
+extern void print_asn1_name(FILE *, const unsigned char *, long);
 extern void print_key(FILE *, char *, struct sadb_key *);
 extern void print_ident(FILE *, char *, struct sadb_ident *);
 extern void print_sens(FILE *, char *, struct sadb_sens *);
diff --git a/usr/src/lib/libipsecutil/common/mapfile-vers b/usr/src/lib/libipsecutil/common/mapfile-vers
index 35f018cd05..89a9831eab 100644
--- a/usr/src/lib/libipsecutil/common/mapfile-vers
+++ b/usr/src/lib/libipsecutil/common/mapfile-vers
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -68,6 +68,7 @@ SUNWprivate_1.1 {
 	parsedbgopts;
 	pflag;
 	print_address;
+	print_asn1_name;
 	print_diagnostic;
 	print_eprop;
 	print_ident;