Some older code (never committed) wasn't converted to the new format.

Corrected.

crypto/dso/dso.h

@@ -345,6 +345,7 @@ void ERR_load_DSO_strings(void);
 #define DSO_R_LOAD_FAILED				 103
 #define DSO_R_NAME_TRANSLATION_FAILED			 109
 #define DSO_R_NO_FILENAME				 111
+#define DSO_R_NO_FILE_SPECIFICATION			 116
 #define DSO_R_NULL_HANDLE				 104
 #define DSO_R_SET_FILENAME_FAILED			 112
 #define DSO_R_STACK_ERROR				 105

crypto/dso/dso_err.c

@@ -116,6 +116,7 @@ static ERR_STRING_DATA DSO_str_reasons[]=
 {DSO_R_LOAD_FAILED                       ,"could not load the shared library"},
 {DSO_R_NAME_TRANSLATION_FAILED           ,"name translation failed"},
 {DSO_R_NO_FILENAME                       ,"no filename"},
+{DSO_R_NO_FILE_SPECIFICATION             ,"no file specification"},
 {DSO_R_NULL_HANDLE                       ,"a null shared library handle was used"},
 {DSO_R_SET_FILENAME_FAILED               ,"set filename failed"},
 {DSO_R_STACK_ERROR                       ,"the meth_data stack is corrupt"},

crypto/dso/dso_lib.c

@@ -394,7 +394,7 @@ char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
 	{
 	char *result = NULL;
 
-	if(dso == NULL || dir == NULL)
+	if(dso == NULL || filespec1 == NULL)
 		{
 		DSOerr(DSO_F_DSO_MERGE,ERR_R_PASSED_NULL_PARAMETER);
 		return(NULL);
@@ -403,7 +403,7 @@ char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
 		filespec1 = dso->filename;
 	if(filespec1 == NULL)
 		{
-		DSOerr(DSO_F_DSO_MERGE,DSO_R_NO_FILENAME);
+		DSOerr(DSO_F_DSO_MERGE,DSO_R_NO_FILE_SPECIFICATION);
 		return(NULL);
 		}
 	if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0)