Make some Unix builds work again.

[openssl.git] / crypto / dso / dso_vms.c

diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index bd284535f1a2c1fd943f948f56fa1094404e1e9c..45adfb1587751afa19ebfd643a5108d4670555bd 100644 (file)
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -1,4 +1,4 @@
-/* dso_vms.c */
+/* dso_vms.c -*- mode:C; c-file-style: "eay" -*- */

 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2000.
  */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2000.
  */


@@ -59,18 +59,30 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>

-#ifdef VMS
+#include "cryptlib.h"
+#include <openssl/dso.h>
+#ifdef OPENSSL_SYS_VMS

 #pragma message disable DOLLARID
 #pragma message disable DOLLARID

+#include <rms.h>

 #include <lib$routines.h>
 #include <lib$routines.h>

-#include <libfisdef.h>

 #include <stsdef.h>
 #include <descrip.h>
 #include <starlet.h>
 #include <stsdef.h>
 #include <descrip.h>
 #include <starlet.h>

+#include "vms_rms.h"

 #endif
 #endif

-#include "cryptlib.h"
-#include <openssl/dso.h>

 
 

-#ifndef VMS
+/* Some compiler options may mask the declaration of "_malloc32". */
+#if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
+# if __INITIAL_POINTER_SIZE == 64
+#  pragma pointer_size save
+#  pragma pointer_size 32
+    void * _malloc32  (__size_t);
+#  pragma pointer_size restore
+# endif /* __INITIAL_POINTER_SIZE == 64 */
+#endif /* __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE */
+
+
+#ifndef OPENSSL_SYS_VMS

 DSO_METHOD *DSO_METHOD_vms(void)
        {
        return NULL;
 DSO_METHOD *DSO_METHOD_vms(void)
        {
        return NULL;


@@ -89,7 +101,9 @@ static int vms_init(DSO *dso);
 static int vms_finish(DSO *dso);
 static long vms_ctrl(DSO *dso, int cmd, long larg, void *parg);
 #endif
 static int vms_finish(DSO *dso);
 static long vms_ctrl(DSO *dso, int cmd, long larg, void *parg);
 #endif

-static char *vms_name_converter(DSO *dso);
+static char *vms_name_converter(DSO *dso, const char *filename);
+static char *vms_merger(DSO *dso, const char *filespec1,
+       const char *filespec2);

 
 static DSO_METHOD dso_meth_vms = {
        "OpenSSL 'VMS' shared library method",
 
 static DSO_METHOD dso_meth_vms = {
        "OpenSSL 'VMS' shared library method",


@@ -104,6 +118,7 @@ static DSO_METHOD dso_meth_vms = {
 #endif
        NULL, /* ctrl */
        vms_name_converter,
 #endif
        NULL, /* ctrl */
        vms_name_converter,

+       vms_merger,

        NULL, /* init */
        NULL  /* finish */
        };
        NULL, /* init */
        NULL  /* finish */
        };


@@ -118,14 +133,13 @@ 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;
        /* 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];
+       char filename[ NAMX_MAXRSS+ 1];

        /* This contains whatever is not in filename, if needed.
         * Normally not defined. */
        struct dsc$descriptor_s imagename_dsc;
        /* This contains whatever is not in filename, if needed.
         * Normally not defined. */
        struct dsc$descriptor_s imagename_dsc;

-       char imagename[FILENAME_MAX+1];
+       char imagename[ NAMX_MAXRSS+ 1];

        } DSO_VMS_INTERNAL;
 
        } DSO_VMS_INTERNAL;
 

-

 DSO_METHOD *DSO_METHOD_vms(void)
        {
        return(&dso_meth_vms);
 DSO_METHOD *DSO_METHOD_vms(void)
        {
        return(&dso_meth_vms);


@@ -133,10 +147,33 @@ DSO_METHOD *DSO_METHOD_vms(void)
 
 static int vms_load(DSO *dso)
        {
 
 static int vms_load(DSO *dso)
        {

-#if 0
+       void *ptr = NULL;
+       /* See applicable comments in dso_dl.c */
+       char *filename = DSO_convert_filename(dso, NULL);
+
+/* Ensure 32-bit pointer for "p", and appropriate malloc() function. */
+#if __INITIAL_POINTER_SIZE == 64
+# define DSO_MALLOC _malloc32
+# pragma pointer_size save
+# pragma pointer_size 32
+#else /* __INITIAL_POINTER_SIZE == 64 */
+# define DSO_MALLOC OPENSSL_malloc
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+

        DSO_VMS_INTERNAL *p;
        DSO_VMS_INTERNAL *p;

+
+#if __INITIAL_POINTER_SIZE == 64
+# pragma pointer_size restore
+#endif /* __INITIAL_POINTER_SIZE == 64 */
+

        const char *sp1, *sp2;  /* Search result */
 
        const char *sp1, *sp2;  /* Search result */
 

+       if(filename == NULL)
+               {
+               DSOerr(DSO_F_VMS_LOAD,DSO_R_NO_FILENAME);
+               goto err;
+               }
+

        /* A file specification may look like this:
         *
         *      node::dev:[dir-spec]name.type;ver
        /* A file specification may look like this:
         *
         *      node::dev:[dir-spec]name.type;ver


@@ -178,14 +215,14 @@ static int vms_load(DSO *dso)
                || (sp1 - filename) + strlen(sp2) > FILENAME_MAX)
                {
                DSOerr(DSO_F_VMS_LOAD,DSO_R_FILENAME_TOO_BIG);
                || (sp1 - filename) + strlen(sp2) > FILENAME_MAX)
                {
                DSOerr(DSO_F_VMS_LOAD,DSO_R_FILENAME_TOO_BIG);

-               return(0);
+               goto err;

                }
 
                }
 

-       p = (DSO_VMS_INTERNAL *)OPENSSL_malloc(sizeof(DSO_VMS_INTERNAL));
+       p = DSO_MALLOC(sizeof(DSO_VMS_INTERNAL));

        if(p == NULL)
                {
                DSOerr(DSO_F_VMS_LOAD,ERR_R_MALLOC_FAILURE);
        if(p == NULL)
                {
                DSOerr(DSO_F_VMS_LOAD,ERR_R_MALLOC_FAILURE);

-               return(0);
+               goto err;

                }
 
        strncpy(p->filename, sp1, sp2-sp1);
                }
 
        strncpy(p->filename, sp1, sp2-sp1);


@@ -204,19 +241,22 @@ static int vms_load(DSO *dso)
        p->imagename_dsc.dsc$b_class = DSC$K_CLASS_S;
        p->imagename_dsc.dsc$a_pointer = p->imagename;
 
        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))
+       if(!sk_void_push(dso->meth_data, (char *)p))

                {
                DSOerr(DSO_F_VMS_LOAD,DSO_R_STACK_ERROR);
                {
                DSOerr(DSO_F_VMS_LOAD,DSO_R_STACK_ERROR);

-               OPENSSL_free(p);
-               return(0);
+               goto err;

                }
                }

+
+       /* Success (for now, we lie.  We actually do not know...) */
+       dso->loaded_filename = filename;

        return(1);
        return(1);

-#else
-       /* See the comments lower down in the vms_name_converter
-        * "implementation" :-) */
-       please_break_compilation();
-       return(bother_richard);
-#endif
+err:
+       /* Cleanup! */
+       if(p != NULL)
+               OPENSSL_free(p);
+       if(filename != NULL)
+               OPENSSL_free(filename);
+       return(0);

        }
 
 /* Note that this doesn't actually unload the shared image, as there is no
        }
 
 /* Note that this doesn't actually unload the shared image, as there is no


@@ -231,9 +271,9 @@ static int vms_unload(DSO *dso)
                DSOerr(DSO_F_VMS_UNLOAD,ERR_R_PASSED_NULL_PARAMETER);
                return(0);
                }
                DSOerr(DSO_F_VMS_UNLOAD,ERR_R_PASSED_NULL_PARAMETER);
                return(0);
                }

-       if(sk_num(dso->meth_data) < 1)
+       if(sk_void_num(dso->meth_data) < 1)

                return(1);
                return(1);

-       p = (DSO_VMS_INTERNAL *)sk_pop(dso->meth_data);
+       p = (DSO_VMS_INTERNAL *)sk_void_pop(dso->meth_data);

        if(p == NULL)
                {
                DSOerr(DSO_F_VMS_UNLOAD,DSO_R_NULL_HANDLE);
        if(p == NULL)
                {
                DSOerr(DSO_F_VMS_UNLOAD,DSO_R_NULL_HANDLE);


@@ -269,30 +309,55 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
        {
        DSO_VMS_INTERNAL *ptr;
        int status;
        {
        DSO_VMS_INTERNAL *ptr;
        int status;

-       int flags = LIB$M_FIS_MIXEDCASE;
+#if 0
+       int flags = (1<<4); /* LIB$M_FIS_MIXEDCASE, but this symbol isn't
+                               defined in VMS older than 7.0 or so */
+#else
+       int flags = 0;
+#endif

        struct dsc$descriptor_s symname_dsc;
        struct dsc$descriptor_s symname_dsc;

-       *sym = NULL;

 
 

-       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 */
+/* Arrange 32-bit pointer to (copied) string storage, if needed. */
+#if __INITIAL_POINTER_SIZE == 64
+# define SYMNAME symname_32p
+# pragma pointer_size save
+# pragma pointer_size 32
+       char *symname_32p;
+# pragma pointer_size restore
+       char symname_32[ NAMX_MAXRSS+ 1];
+#else /* __INITIAL_POINTER_SIZE == 64 */
+# define SYMNAME ((char *) symname)
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+
+       *sym = NULL;

 
        if((dso == NULL) || (symname == NULL))
                {
 
        if((dso == NULL) || (symname == NULL))
                {

-               DSOerr(DSO_F_VMS_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
+               DSOerr(DSO_F_VMS_BIND_SYM,ERR_R_PASSED_NULL_PARAMETER);

                return;
                }
                return;
                }

-       if(sk_num(dso->meth_data) < 1)
+
+#if __INITIAL_POINTER_SIZE == 64
+       /* Copy the symbol name to storage with a 32-bit pointer. */
+       symname_32p = symname_32;
+       strcpy( symname_32p, symname);
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+
+       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 = SYMNAME;
+
+       if(sk_void_num(dso->meth_data) < 1)

                {
                {

-               DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_STACK_ERROR);
+               DSOerr(DSO_F_VMS_BIND_SYM,DSO_R_STACK_ERROR);

                return;
                }
                return;
                }

-       ptr = (DSO_VMS_INTERNAL *)sk_value(dso->meth_data,
-               sk_num(dso->meth_data) - 1);
+       ptr = (DSO_VMS_INTERNAL *)sk_void_value(dso->meth_data,
+               sk_void_num(dso->meth_data) - 1);

        if(ptr == NULL)
                {
        if(ptr == NULL)
                {

-               DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_NULL_HANDLE);
+               DSOerr(DSO_F_VMS_BIND_SYM,DSO_R_NULL_HANDLE);

                return;
                }
 
                return;
                }
 


@@ -321,7 +386,7 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
                        {
                        errstring[length] = '\0';
 
                        {
                        errstring[length] = '\0';
 

-                       DSOerr(DSO_F_VMS_BIND_VAR,DSO_R_SYM_FAILURE);
+                       DSOerr(DSO_F_VMS_BIND_SYM,DSO_R_SYM_FAILURE);

                        if (ptr->imagename_dsc.dsc$w_length)
                                ERR_add_error_data(9,
                                        "Symbol ", symname,
                        if (ptr->imagename_dsc.dsc$w_length)
                                ERR_add_error_data(9,
                                        "Symbol ", symname,


@@ -353,26 +418,108 @@ static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname)
        return sym;
        }
 
        return sym;
        }
 

-static char *vms_name_converter(DSO *dso)
+
+static char *vms_merger(DSO *dso, const char *filespec1, const char *filespec2)

        {
        {

-       /* Implementation note: on VMS is it preferable to do real conversions
-        * here, or to actually have it performed in-line with the bind calls
-        * (given that VMS never actually does a load except implicitly within
-        * the bind functions). Another note: normally (eg. dlfcn), the
-        * DSO_load call will either load, put the loaded filename into the DSO
-        * (which marks it effectively as "read-only"), and return success - or
-        * it will fail. VMS needs to work out what to do - otherwise DSO_load
-        * will always succeed, but leave the DSO looking unloaded (because the
-        * loaded_filename will be NULL still) and then real loading (and
-        * setting of loaded_filename) will only happen during the first bind
-        * call (which should have error checking anyway to prevent you calling
-        * it on an "unloaded" DSO - thus giving VMS *serious* grief). Richard,
-        * what do you think? Is it worth having DSO_load() try to find and pin
-        * itself to a library file (and populate loaded_filename) even though
-        * it's unecessary to actually do a load prior to the first bind call?
-        * I leave it to you ... :-) */
-       deliberately_break_compilation_here();
-       return(1);
+       int status;
+       int filespec1len, filespec2len;
+       struct FAB fab;
+       struct NAMX_STRUCT nam;
+       char esa[ NAMX_MAXRSS+ 1];
+       char *merged;
+
+/* Arrange 32-bit pointer to (copied) string storage, if needed. */
+#if __INITIAL_POINTER_SIZE == 64
+# define FILESPEC1 filespec1_32p;
+# define FILESPEC2 filespec2_32p;
+# pragma pointer_size save
+# pragma pointer_size 32
+       char *filespec1_32p;
+       char *filespec2_32p;
+# pragma pointer_size restore
+       char filespec1_32[ NAMX_MAXRSS+ 1];
+       char filespec2_32[ NAMX_MAXRSS+ 1];
+#else /* __INITIAL_POINTER_SIZE == 64 */
+# define FILESPEC1 ((char *) filespec1)
+# define FILESPEC2 ((char *) filespec2)
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+
+       if (!filespec1) filespec1 = "";
+       if (!filespec2) filespec2 = "";
+       filespec1len = strlen(filespec1);
+       filespec2len = strlen(filespec2);
+
+#if __INITIAL_POINTER_SIZE == 64
+       /* Copy the file names to storage with a 32-bit pointer. */
+       filespec1_32p = filespec1_32;
+       filespec2_32p = filespec2_32;
+       strcpy( filespec1_32p, filespec1);
+       strcpy( filespec2_32p, filespec2);
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+
+       fab = cc$rms_fab;
+       nam = CC_RMS_NAMX;
+
+       FAB_OR_NAML( fab, nam).FAB_OR_NAML_FNA = FILESPEC1;
+       FAB_OR_NAML( fab, nam).FAB_OR_NAML_FNS = filespec1len;
+       FAB_OR_NAML( fab, nam).FAB_OR_NAML_DNA = FILESPEC2;
+       FAB_OR_NAML( fab, nam).FAB_OR_NAML_DNS = filespec2len;
+       NAMX_DNA_FNA_SET( fab)
+
+       nam.NAMX_ESA = esa;
+       nam.NAMX_ESS = NAMX_MAXRSS;
+       nam.NAMX_NOP = NAM$M_SYNCHK | NAM$M_PWD;
+       SET_NAMX_NO_SHORT_UPCASE( nam);
+
+       fab.FAB_NAMX = &nam;
+
+       status = sys$parse(&fab, 0, 0);
+
+       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_MERGER,DSO_R_FAILURE);
+                       ERR_add_error_data(7,
+                                          "filespec \"", filespec1, "\", ",
+                                          "defaults \"", filespec2, "\": ",
+                                          errstring);
+                       }
+               return(NULL);
+               }
+
+       merged = OPENSSL_malloc( nam.NAMX_ESL+ 1);
+       if(!merged)
+               goto malloc_err;
+       strncpy( merged, nam.NAMX_ESA, nam.NAMX_ESL);
+       merged[ nam.NAMX_ESL] = '\0';
+       return(merged);
+ malloc_err:
+       DSOerr(DSO_F_VMS_MERGER,
+               ERR_R_MALLOC_FAILURE);
+       }
+
+static char *vms_name_converter(DSO *dso, const char *filename)
+       {
+        int len = strlen(filename);
+        char *not_translated = OPENSSL_malloc(len+1);
+        strcpy(not_translated,filename);
+       return(not_translated);

        }
 
        }
 

-#endif /* VMS */
+#endif /* OPENSSL_SYS_VMS */