diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-07-15 15:35:40 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-07-15 15:35:40 +0000 |
| commit | cbecb3ac3763f1179dc220a69d28e92f58e9443e (patch) | |
| tree | 58206855d0392cb81f393bf8de190c413ba161ac /crypto/dso/dso_err.c | |
| parent | 5dbd3efce784cb5621de8402430eda23d1762568 (diff) | |
| download | openssl-new-cbecb3ac3763f1179dc220a69d28e92f58e9443e.tar.gz | |
There's an ongoing project to bring some kind of path selection
mechanism to the ENGINE framework. This means there there are going
to be new functionality for the DSO part, and ultimately some way of
merging two file specifications together.
This commit places the merging code into the repository. It's
currently not used anywhere, and hasn't been tested at all. It may be
full of errors, including syntactical ones. Those will be fixed as
promptly as possible.
Diffstat (limited to 'crypto/dso/dso_err.c')
| -rw-r--r-- | crypto/dso/dso_err.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c index cf452de1aa..23ccfc00c5 100644 --- a/crypto/dso/dso_err.c +++ b/crypto/dso/dso_err.c @@ -1,6 +1,6 @@ /* crypto/dso/dso_err.c */ /* ==================================================================== - * Copyright (c) 1999 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2002 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 @@ -69,11 +69,13 @@ static ERR_STRING_DATA DSO_str_functs[]= {ERR_PACK(0,DSO_F_DLFCN_BIND_FUNC,0), "DLFCN_BIND_FUNC"}, {ERR_PACK(0,DSO_F_DLFCN_BIND_VAR,0), "DLFCN_BIND_VAR"}, {ERR_PACK(0,DSO_F_DLFCN_LOAD,0), "DLFCN_LOAD"}, +{ERR_PACK(0,DSO_F_DLFCN_MERGER,0), "DLFCN_MERGER"}, {ERR_PACK(0,DSO_F_DLFCN_NAME_CONVERTER,0), "DLFCN_NAME_CONVERTER"}, {ERR_PACK(0,DSO_F_DLFCN_UNLOAD,0), "DLFCN_UNLOAD"}, {ERR_PACK(0,DSO_F_DL_BIND_FUNC,0), "DL_BIND_FUNC"}, {ERR_PACK(0,DSO_F_DL_BIND_VAR,0), "DL_BIND_VAR"}, {ERR_PACK(0,DSO_F_DL_LOAD,0), "DL_LOAD"}, +{ERR_PACK(0,DSO_F_DL_MERGER,0), "DL_MERGER"}, {ERR_PACK(0,DSO_F_DL_NAME_CONVERTER,0), "DL_NAME_CONVERTER"}, {ERR_PACK(0,DSO_F_DL_UNLOAD,0), "DL_UNLOAD"}, {ERR_PACK(0,DSO_F_DSO_BIND_FUNC,0), "DSO_bind_func"}, @@ -84,16 +86,19 @@ static ERR_STRING_DATA DSO_str_functs[]= {ERR_PACK(0,DSO_F_DSO_GET_FILENAME,0), "DSO_get_filename"}, {ERR_PACK(0,DSO_F_DSO_GET_LOADED_FILENAME,0), "DSO_get_loaded_filename"}, {ERR_PACK(0,DSO_F_DSO_LOAD,0), "DSO_load"}, +{ERR_PACK(0,DSO_F_DSO_MERGE,0), "DSO_merge"}, {ERR_PACK(0,DSO_F_DSO_NEW_METHOD,0), "DSO_new_method"}, {ERR_PACK(0,DSO_F_DSO_SET_FILENAME,0), "DSO_set_filename"}, {ERR_PACK(0,DSO_F_DSO_SET_NAME_CONVERTER,0), "DSO_set_name_converter"}, {ERR_PACK(0,DSO_F_DSO_UP_REF,0), "DSO_up_ref"}, {ERR_PACK(0,DSO_F_VMS_BIND_VAR,0), "VMS_BIND_VAR"}, {ERR_PACK(0,DSO_F_VMS_LOAD,0), "VMS_LOAD"}, +{ERR_PACK(0,DSO_F_VMS_MERGER,0), "VMS_MERGER"}, {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_LOAD,0), "WIN32_LOAD"}, +{ERR_PACK(0,DSO_F_WIN32_MERGER,0), "WIN32_MERGER"}, {ERR_PACK(0,DSO_F_WIN32_NAME_CONVERTER,0), "WIN32_NAME_CONVERTER"}, {ERR_PACK(0,DSO_F_WIN32_UNLOAD,0), "WIN32_UNLOAD"}, {0,NULL} @@ -103,8 +108,11 @@ static ERR_STRING_DATA DSO_str_reasons[]= { {DSO_R_CTRL_FAILED ,"control command failed"}, {DSO_R_DSO_ALREADY_LOADED ,"dso already loaded"}, +{DSO_R_EMPTY_FILE_STRUCTURE ,"empty file structure"}, +{DSO_R_FAILURE ,"failure"}, {DSO_R_FILENAME_TOO_BIG ,"filename too big"}, {DSO_R_FINISH_FAILED ,"cleanup method function failed"}, +{DSO_R_INCORRECT_FILE_SYNTAX ,"incorrect file syntax"}, {DSO_R_LOAD_FAILED ,"could not load the shared library"}, {DSO_R_NAME_TRANSLATION_FAILED ,"name translation failed"}, {DSO_R_NO_FILENAME ,"no filename"}, |