Commit a0f63315 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in recent changes from 0.9.6-stable

parent 71aa7c58

apps/asn1pars.c

+1 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ bad: 
		BIO_printf(bio_err,"where options are\n");

		BIO_printf(bio_err," -inform arg   input format - one of DER TXT PEM\n");

		BIO_printf(bio_err," -in arg       input file\n");

		BIO_printf(bio_err," -out arg      output file\n");

		BIO_printf(bio_err," -out arg      output file (output format is always DER\n");

		BIO_printf(bio_err," -noout arg    don't produce any output\n");

		BIO_printf(bio_err," -offset arg   offset into file\n");

		BIO_printf(bio_err," -length arg   length of section in file\n");
@@ -192,7 +192,6 @@ bad: 
		BIO_printf(bio_err," -strparse offset\n");

		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");

		BIO_printf(bio_err,"               ASN1 blob wrappings\n");

		BIO_printf(bio_err," -out filename output DER encoding to file\n");

		goto end;

		}

crypto/asn1/a_bitstr.c

+4 −2
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp) 
	if (a == NULL) return(0);



	len=a->length;

	ret=1+len;

	if (pp == NULL) return(ret);



	if (len > 0)

		{
@@ -118,6 +116,10 @@ int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp) 
		}

	else

		bits=0;



	ret=1+len;

	if (pp == NULL) return(ret);



	p= *pp;



	*(p++)=(unsigned char)bits;

crypto/dso/dso_dlfcn.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ DSO_METHOD *DSO_METHOD_dlfcn(void) 
 * as we don't have autoconf yet, I'm implementing a hack that could

 * be hacked further relatively easily to deal with cases as we find

 * them. Initially this is to cope with OpenBSD. */

#ifdef __OpenBSD__

#if defined(__OpenBSD__) || defined(__NetBSD__)

#	ifdef DL_LAZY

#		define DLOPEN_FLAG DL_LAZY

#	else