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

Merge in recent changes from OpenSSL_0_9_6-stable.

parent 6c2650a6

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ install: all install_docs 
			(       echo installing $$i; \

				if [ "$(PLATFORM)" != "Cygwin" ]; then \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \

					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \

					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \

				else \

					c=`echo $$i | sed 's/^lib/cyg/'`; \

					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \

TABLE

+2 −2
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ $ranlib = 


*** darwin-ppc-cc

$cc           = cc

$cflags       = -O3 -D_DARWIN -DB_ENDIAN

$cflags       = -O3 -D_DARWIN -DB_ENDIAN -fno-common

$unistd       = 

$thread_cflag = -D_REENTRANT

$lflags       =
@@ -3124,7 +3124,7 @@ $rc5_obj = 
$dso_scheme   = dlfcn

$shared_target= solaris-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_ldflag = -m64

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       =

apps/apps.c

+4 −3
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ int set_name_ex(unsigned long *flags, const char *arg) 


void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags)

{

	char buf[256];

	char *buf;

	char mline = 0;

	int indent = 0;

	if(title) BIO_puts(out, title);
@@ -773,9 +773,10 @@ void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags) 
		indent = 4;

	}

	if(lflags == XN_FLAG_COMPAT) {

		X509_NAME_oneline(nm,buf,256);

		buf = X509_NAME_oneline(nm, 0, 0);

		BIO_puts(out, buf);

		BIO_puts(out, "\n");

		OPENSSL_free(buf);

	} else {

		if(mline) BIO_puts(out, "\n");

		X509_NAME_print_ex(out, nm, indent, lflags);

doc/crypto/RSA_check_key.pod

+0 −19
Original line number Diff line number Diff line
@@ -37,25 +37,6 @@ and public exponent elements populated. It performs integrity checks on all 
the RSA key material, so the RSA key structure must contain all the private

key data too.



Unlike most other RSA functions, this function does B<not> work

transparently with any underlying ENGINE implementation because it uses the

key data in the RSA structure directly. An ENGINE implementation can

override the way key data is stored and handled, and can even provide

support for HSM keys - in which case the RSA structure may contain B<no>

key data at all! If the ENGINE in question is only being used for

acceleration or analysis purposes, then in all likelihood the RSA key data

is complete and untouched, but this can't be assumed in the general case.



=head1 BUGS



A method of verifying the RSA key using opaque RSA API functions might need

to be considered. Right now RSA_check_key() simply uses the RSA structure

elements directly, bypassing the RSA_METHOD table altogether (and

completely violating encapsulation and object-orientation in the process).

The best fix will probably be to introduce a "check_key()" handler to the

RSA_METHOD function table so that alternative implementations can also

provide their own verifiers.



=head1 SEE ALSO



L<rsa(3)|rsa(3)>, L<err(3)|err(3)>

doc/ssl/SSL_accept.pod

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ to find out the reason. 
L<SSL_get_error(3)|SSL_get_error(3)>, L<SSL_connect(3)|SSL_connect(3)>,

L<SSL_shutdown(3)|SSL_shutdown(3)>, L<ssl(3)|ssl(3)>, L<bio(3)|bio(3)>,

L<SSL_set_connect_state(3)|SSL_set_connect_state(3)>,

L<SSL_do_handshake(3)|SSL_do_handshake(3)>,

L<SSL_CTX_new(3)|SSL_CTX_new(3)>



=cut