From 0e05f54516c333f0ed270f7a922df0e75e3b5373 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Fri, 15 Sep 2000 21:22:50 +0000
Subject: [PATCH] A DSO method for VMS was missing, and I had the code lying
around...
---
CHANGES | 3 +
crypto/crypto-lib.com | 4 +-
crypto/dso/dso.h | 8 +
crypto/dso/dso_err.c | 5 +
crypto/dso/dso_openssl.c | 2 +
crypto/dso/dso_vms.c | 362 +++++++++++++++++++++++++++++++++++++++
6 files changed, 382 insertions(+), 2 deletions(-)
create mode 100644 crypto/dso/dso_vms.c
diff --git a/CHANGES b/CHANGES
index a0a0512b7d..d47658a203 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
Changes between 0.9.5a and 0.9.6 [xx XXX 2000]
+ *) Add DSO method for VMS.
+ [Richard Levitte]
+
*) Bug fix: Montgomery multiplication could produce results with the
wrong sign.
[Ulf Möller]
diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index 33b3dd0c42..6c8d37a1a0 100644
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -204,7 +204,7 @@ $ LIB_RSA = "rsa_eay,rsa_gen,rsa_lib,rsa_sign,rsa_saos,rsa_err,"+ -
"rsa_pk1,rsa_ssl,rsa_none,rsa_oaep,rsa_chk,rsa_null"
$ LIB_DSA = "dsa_gen,dsa_key,dsa_lib,dsa_asn1,dsa_vrf,dsa_sign,dsa_err,dsa_ossl"
$ LIB_DH = "dh_gen,dh_key,dh_lib,dh_check,dh_err"
-$ LIB_DSO = "dso_err,dso_lib,dso_null,dso_openssl" ! + ",dso_vms"
+$ LIB_DSO = "dso_err,dso_lib,dso_null,dso_openssl,dso_vms"
$ LIB_BUFFER = "buffer,buf_err"
$ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -
"bss_mem,bss_null,bss_fd,"+ -
@@ -1136,7 +1136,7 @@ $ ENDIF
$!
$! Set Up Initial CC Definitions, Possibly With User Ones
$!
-$ CCDEFS = "VMS=1,TCPIP_TYPE_''P5'"
+$ CCDEFS = "VMS=1,TCPIP_TYPE_''P5',DSO_VMS"
$ IF F$TRNLNM("OPENSSL_NO_ASM") THEN CCDEFS = CCDEFS + ",NO_ASM"
$ IF F$TRNLNM("OPENSSL_NO_RSA") THEN CCDEFS = CCDEFS + ",NO_RSA"
$ IF F$TRNLNM("OPENSSL_NO_DSA") THEN CCDEFS = CCDEFS + ",NO_DSA"
diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h
index cd30e61553..bed7c464a6 100644
--- a/crypto/dso/dso.h
+++ b/crypto/dso/dso.h
@@ -191,6 +191,9 @@ DSO_METHOD *DSO_METHOD_dl(void);
/* If WIN32 is defined, use DLLs. If not, return NULL. */
DSO_METHOD *DSO_METHOD_win32(void);
+/* If VMS is defined, use shared images. If not, return NULL. */
+DSO_METHOD *DSO_METHOD_vms(void);
+
void ERR_load_DSO_strings(void);
/* BEGIN ERROR CODES */
@@ -218,6 +221,10 @@ void ERR_load_DSO_strings(void);
#define DSO_F_DSO_LOAD 114
#define DSO_F_DSO_NEW_METHOD 115
#define DSO_F_DSO_UP 116
+#define DSO_F_VMS_BIND_VAR 122
+#define DSO_F_VMS_CTRL 123
+#define DSO_F_VMS_LOAD 124
+#define DSO_F_VMS_UNLOAD 125
#define DSO_F_WIN32_BIND_FUNC 117
#define DSO_F_WIN32_BIND_VAR 118
#define DSO_F_WIN32_CTRL 119
@@ -226,6 +233,7 @@ void ERR_load_DSO_strings(void);
/* Reason codes. */
#define DSO_R_CTRL_FAILED 100
+#define DSO_R_FILENAME_TOO_BIG 109
#define DSO_R_FINISH_FAILED 101
#define DSO_R_LOAD_FAILED 102
#define DSO_R_NULL_HANDLE 103
diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c
index 70d35cea26..a3d7321c9b 100644
--- a/crypto/dso/dso_err.c
+++ b/crypto/dso/dso_err.c
@@ -83,6 +83,10 @@ static ERR_STRING_DATA DSO_str_functs[]=
{ERR_PACK(0,DSO_F_DSO_LOAD,0), "DSO_load"},
{ERR_PACK(0,DSO_F_DSO_NEW_METHOD,0), "DSO_new_method"},
{ERR_PACK(0,DSO_F_DSO_UP,0), "DSO_up"},
+{ERR_PACK(0,DSO_F_VMS_BIND_VAR,0), "VMS_BIND_VAR"},
+{ERR_PACK(0,DSO_F_VMS_CTRL,0), "VMS_CTRL"},
+{ERR_PACK(0,DSO_F_VMS_LOAD,0), "VMS_LOAD"},
+{ERR_PACK(0,DSO_F_VMS_UNLOAD,0), "VMS_UNLOAD"},
{ERR_PACK(0,DSO_F_WIN32_BIND_FUNC,0), "WIN32_BIND_FUNC"},
{ERR_PACK(0,DSO_F_WIN32_BIND_VAR,0), "WIN32_BIND_VAR"},
{ERR_PACK(0,DSO_F_WIN32_CTRL,0), "WIN32_CTRL"},
@@ -94,6 +98,7 @@ static ERR_STRING_DATA DSO_str_functs[]=
static ERR_STRING_DATA DSO_str_reasons[]=
{
{DSO_R_CTRL_FAILED ,"control command failed"},
+{DSO_R_FILENAME_TOO_BIG ,"filename too big"},
{DSO_R_FINISH_FAILED ,"cleanup method function failed"},
{DSO_R_LOAD_FAILED ,"could not load the shared library"},
{DSO_R_NULL_HANDLE ,"a null shared library handle was used"},
diff --git a/crypto/dso/dso_openssl.c b/crypto/dso/dso_openssl.c
index fb12572311..a4395ebffe 100644
--- a/crypto/dso/dso_openssl.c
+++ b/crypto/dso/dso_openssl.c
@@ -72,6 +72,8 @@ DSO_METHOD *DSO_METHOD_openssl(void)
return(DSO_METHOD_dl());
#elif defined(DSO_WIN32)
return(DSO_METHOD_win32());
+#elif defined(DSO_VMS)
+ return(DSO_METHOD_vms());
#else
return(DSO_METHOD_null());
#endif
diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
new file mode 100644
index 0000000000..93c2a29606
--- /dev/null
+++ b/crypto/dso/dso_vms.c
@@ -0,0 +1,362 @@
+/* dso_vms.c */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2000.
+ */
+/* ====================================================================
+ * Copyright (c) 2000 The OpenSSL Project. All rights reserved.
+ *
+ * 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 above 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 acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ * nor may "OpenSSL" appear in their names without prior written
+ * permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED 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 OpenSSL PROJECT OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com). This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <lib$routines.h>
+#include <libfisdef.h>
+#include <stsdef.h>
+#include <descrip.h>
+#include <starlet.h>
+#include "cryptlib.h"
+#include <openssl/dso.h>
+
+#ifndef VMS
+DSO_METHOD *DSO_METHOD_vms(void)
+ {
+ return NULL;
+ }
+#else
+#pragma message disable DOLLARID
+
+static int vms_load(DSO *dso, const char *filename);
+static int vms_unload(DSO *dso);
+static void *vms_bind_var(DSO *dso, const char *symname);
+static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname);
+#if 0
+static int vms_unbind_var(DSO *dso, char *symname, void *symptr);
+static int vms_unbind_func(DSO *dso, char *symname, DSO_FUNC_TYPE symptr);
+static int vms_init(DSO *dso);
+static int vms_finish(DSO *dso);
+#endif
+static long vms_ctrl(DSO *dso, int cmd, long larg, void *parg);
+
+static DSO_METHOD dso_meth_vms = {
+ "OpenSSL 'VMS' shared library method",
+ vms_load,
+ NULL, /* unload */
+ vms_bind_var,
+ vms_bind_func,
+/* For now, "unbind" doesn't exist */
+#if 0
+ NULL, /* unbind_var */
+ NULL, /* unbind_func */
+#endif
+ vms_ctrl,
+ NULL, /* init */
+ NULL /* finish */
+ };
+
+/* On VMS, the only "handle" is the file name. LIB$FIND_IMAGE_SYMBOL depends
+ * on the reference to the file name being the same for all calls regarding
+ * one shared image, so we'll just store it in an instance of the following
+ * structure and put a pointer to that instance in the meth_data stack.
+ */
+typedef struct dso_internal_st
+ {
+ /* This should contain the name only, no directory,
+ * no extension, nothing but a name. */
+ struct dsc$descriptor_s filename_dsc;
+ char filename[FILENAME_MAX+1];
+ /* This contains whatever is not in filename, if needed.
+ * Normally not defined. */
+ struct dsc$descriptor_s imagename_dsc;
+ char imagename[FILENAME_MAX+1];
+ } DSO_VMS_INTERNAL;
+
+
+DSO_METHOD *DSO_METHOD_vms(void)
+ {
+ return(&dso_meth_vms);
+ }
+
+static int vms_load(DSO *dso, const char *filename)
+ {
+ DSO_VMS_INTERNAL *p;
+ const char *sp1, *sp2; /* Search result */
+
+ /* A file specification may look like this:
+ *
+ * node::dev:[dir-spec]name.type;ver
+ *
+ * or (for compatibility with TOPS-20):
+ *
+ * node::dev:<dir-spec>name.type;ver
+ *
+ * and the dir-spec uses '.' as separator. Also, a dir-spec
+ * may consist of several parts, with mixed use of [] and <>:
+ *
+ * [dir1.]<dir2>
+ *
+ * We need to split the file specification into the name and
+ * the rest (both before and after the name itself).
+ */
+ /* Start with trying to find the end of a dir-spec, and save the
+ position of the byte after in sp1 */
+ sp1 = strrchr(filename, ']');
+ sp2 = strrchr(filename, '>');
+ if (sp1 == NULL) sp1 = sp2;
+ if (sp2 != NULL && sp2 > sp1) sp1 = sp2;
+ if (sp1 == NULL) sp1 = strrchr(filename, ':');
+ if (sp1 == NULL)
+ sp1 = filename;
+ else
+ sp1++; /* The byte after the found character */
+ /* Now, let's see if there's a type, and save the position in sp2 */
+ sp2 = strchr(sp1, '.');
+ /* If we found it, that's where we'll cut. Otherwise, look for a
+ version number and save the position in sp2 */
+ if (sp2 == NULL) sp2 = strchr(sp1, ';');
+ /* If there was still nothing to find, set sp2 to point at the end of
+ the string */
+ if (sp2 == NULL) sp2 = sp1 + strlen(sp1);
+
+ /* Check that we won't get buffer overflows */
+ if (sp2 - sp1 > FILENAME_MAX
+ || (sp1 - filename) + strlen(sp2) > FILENAME_MAX)
+ {
+ DSOerr(DSO_F_VMS_LOAD,DSO_R_FILENAME_TOO_BIG);
+ return(0);
+ }
+
+ p = (DSO_VMS_INTERNAL *)OPENSSL_malloc(sizeof(DSO_VMS_INTERNAL));
+ if(p == NULL)
+ {
+ DSOerr(DSO_F_VMS_LOAD,ERR_R_MALLOC_FAILURE);
+ return(0);
+ }
+
+ strncpy(p->filename, sp1, sp2-sp1);
+ p->filename[sp2-sp1] = '\0';
+
+ strncpy(p->imagename, filename, sp1-filename);
+ p->imagename[sp1-filename] = '\0';
+ strcat(p->imagename, sp2);
+
+ p->filename_dsc.dsc$w_length = strlen(p->filename);
+ p->filename_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
+ p->filename_dsc.dsc$b_class = DSC$K_CLASS_S;
+ p->filename_dsc.dsc$a_pointer = p->filename;
+ p->imagename_dsc.dsc$w_length = strlen(p->imagename);
+ p->imagename_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
+ p->imagename_dsc.dsc$b_class = DSC$K_CLASS_S;
+ p->imagename_dsc.dsc$a_pointer = p->imagename;
+
+ if(!sk_push(dso->meth_data, (char *)p))
+ {
+ DSOerr(DSO_F_VMS_LOAD,DSO_R_STACK_ERROR);
+ OPENSSL_free(p);
+ return(0);
+ }
+ return(1);
+ }
+
+/* Note that this doesn't actually unload the shared image, as there is no
+ * such thing in VMS. Next time it get loaded again, a new copy will
+ * actually be loaded.
+ */
+static int vms_unload(DSO *dso)
+ {
+ DSO_VMS_INTERNAL *p;
+ if(dso == NULL)
+ {
+ DSOerr(DSO_F_VMS_UNLOAD,ERR_R_PASSED_NULL_PARAMETER);
+ return(0);
+ }
+ if(sk_num(dso->meth_data) < 1)
+ return(1);
+ p = (DSO_VMS_INTERNAL *)sk_pop(dso->meth_data);
+ if(p == NULL)
+ {
+ DSOerr(DSO_F_VMS_UNLOAD,DSO_R_NULL_HANDLE);
+ return(0);
+ }
+ /* Cleanup */
+ OPENSSL_free(p);
+ return(1);
+ }
+
+/* We must do this in a separate function because of the way the exception
+ handler works (it makes this function return */
+static int do_find_symbol(DSO_VMS_INTERNAL *ptr,
+ struct dsc$descriptor_s *symname_dsc, void **sym,
+ unsigned long flags)
+ {
+ /* Make sure that signals are caught and returned instead of
+ aborting the program. The exception handler gets unestablished
+ automatically on return from this function. */
+ lib$establish(lib$sig_to_ret);
+
+ if(ptr->imagename_dsc.dsc$w_length)
+ return lib$find_image_symbol(&ptr->filename_dsc,
+ symname_dsc, sym,
+ &ptr->imagename_dsc, flags);
+ else
+ return lib$find_image_symbol(&ptr->filename_dsc,
+ symname_dsc, sym,
+ 0, flags);
+ }
+
+static void *vms_bind_sym(DSO *dso, const char *symname)
+ {
+ DSO_VMS_INTERNAL *ptr;
+ void *sym = 0;
+ int status;
+ int flags = LIB$M_FIS_MIXEDCASE;
+ struct dsc$descriptor_s symname_dsc;
+
+ symname_dsc.dsc$w_length = strlen(symname);
+ symname_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
+ symname_dsc.dsc$b_class = DSC$K_CLASS_S;
+ symname_dsc.dsc$a_pointer = (char *)symname; /* The cast is needed */
+
+ if((dso == NULL) || (symname == NULL))
+ {
+ DSOerr(DSO_F_VMS_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
+ return(NULL);
+ }
+ if(sk_num(dso->meth_data) < 1)
+ {
+ DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_STACK_ERROR);
+ return(NULL);
+ }
+ ptr = (DSO_VMS_INTERNAL *)sk_value(dso->meth_data,
+ sk_num(dso->meth_data) - 1);
+ if(ptr == NULL)
+ {
+ DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_NULL_HANDLE);
+ return(NULL);
+ }
+
+ if(dso->flags & DSO_FLAG_UPCASE_SYMBOL) flags = 0;
+
+ status = do_find_symbol(ptr, &symname_dsc, &sym, flags);
+
+ if(!$VMS_STATUS_SUCCESS(status))
+ {
+ unsigned short length;
+ char errstring[257];
+ struct dsc$descriptor_s errstring_dsc;
+
+ errstring_dsc.dsc$w_length = sizeof(errstring);
+ errstring_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
+ errstring_dsc.dsc$b_class = DSC$K_CLASS_S;
+ errstring_dsc.dsc$a_pointer = errstring;
+
+ status = sys$getmsg(status, &length, &errstring_dsc, 1, 0);
+
+ if (!$VMS_STATUS_SUCCESS(status))
+ lib$signal(status); /* This is really bad. Abort! */
+ else
+ {
+ errstring[length] = '\0';
+
+ DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_SYM_FAILURE);
+ if (ptr->imagename_dsc.dsc$w_length)
+ ERR_add_error_data(9,
+ "Symbol ", symname,
+ " in ", ptr->filename,
+ " (", ptr->imagename, ")",
+ ": ", errstring);
+ else
+ ERR_add_error_data(6,
+ "Symbol ", symname,
+ " in ", ptr->filename,
+ ": ", errstring);
+ }
+ return(NULL);
+ }
+ return(sym);
+ }
+
+static void *vms_bind_var(DSO *dso, const char *symname)
+ {
+ return vms_bind_sym(dso, symname);
+ }
+
+static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname)
+ {
+ return (DSO_FUNC_TYPE)vms_bind_sym(dso, symname);
+ }
+
+static long vms_ctrl(DSO *dso, int cmd, long larg, void *parg)
+ {
+ if(dso == NULL)
+ {
+ DSOerr(DSO_F_VMS_CTRL,ERR_R_PASSED_NULL_PARAMETER);
+ return(-1);
+ }
+ switch(cmd)
+ {
+ case DSO_CTRL_GET_FLAGS:
+ return dso->flags;
+ case DSO_CTRL_SET_FLAGS:
+ dso->flags = (int)larg;
+ return(0);
+ case DSO_CTRL_OR_FLAGS:
+ dso->flags |= (int)larg;
+ return(0);
+ default:
+ break;
+ }
+ DSOerr(DSO_F_VMS_CTRL,DSO_R_UNKNOWN_COMMAND);
+ return(-1);
+ }
+
+#endif /* VMS */
--
2.25.1