← Back to branch summary

~ubuntu-branches/ubuntu/hardy/openssl/hardy-security

« back to all changes in this revision

Viewing changes to crypto/dso/dso_lib.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2005-12-13 21:37:42 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051213213742-7em5nrw5c7ceegyd
Tags: 0.9.8a-5
http://bugs.debian.org/335912
Stop ssh from crashing randomly on sparc (Closes: #335912)
Patch from upstream cvs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/dso/dso_lib.c
1
 
/* dso_lib.c */
 
1
/* dso_lib.c -*- mode:C; c-file-style: "eay" -*- */
2
2
/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
3
3
 * project 2000.
4
4
 */
390
390
        return(1);
391
391
        }
392
392
 
 
393
char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
 
394
        {
 
395
        char *result = NULL;
 
396
 
 
397
        if(dso == NULL || filespec1 == NULL)
 
398
                {
 
399
                DSOerr(DSO_F_DSO_MERGE,ERR_R_PASSED_NULL_PARAMETER);
 
400
                return(NULL);
 
401
                }
 
402
        if(filespec1 == NULL)
 
403
                filespec1 = dso->filename;
 
404
        if(filespec1 == NULL)
 
405
                {
 
406
                DSOerr(DSO_F_DSO_MERGE,DSO_R_NO_FILE_SPECIFICATION);
 
407
                return(NULL);
 
408
                }
 
409
        if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0)
 
410
                {
 
411
                if(dso->merger != NULL)
 
412
                        result = dso->merger(dso, filespec1, filespec2);
 
413
                else if(dso->meth->dso_merger != NULL)
 
414
                        result = dso->meth->dso_merger(dso,
 
415
                                filespec1, filespec2);
 
416
                }
 
417
        return(result);
 
418
        }
 
419
 
393
420
char *DSO_convert_filename(DSO *dso, const char *filename)
394
421
        {
395
422
        char *result = NULL;