Commit 811756e6 authored by Richard Levitte's avatar Richard Levitte
Browse files

Some changes from 0.9.7-stable that haven't been merged in yet.

parent 8c496048

crypto/ocsp/ocsp_lib.c

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ int OCSP_parse_url(char *url, char **phost, char **pport, char **ppath, int *pss 




	err:

	if (buf) OPENSSL_free(buf);

	if (*ppath) OPENSSL_free(*ppath);

	if (*pport) OPENSSL_free(*pport);

	if (*phost) OPENSSL_free(*phost);

crypto/pem/pem_pkey.c

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, vo 
		p8inf=d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len);

		if(!p8inf) goto p8err;

		ret = EVP_PKCS82PKEY(p8inf);

		if(x) {

			if(*x) EVP_PKEY_free((EVP_PKEY *)*x);

			*x = ret;

		}

		PKCS8_PRIV_KEY_INFO_free(p8inf);

	} else if (strcmp(nm,PEM_STRING_PKCS8) == 0) {

		PKCS8_PRIV_KEY_INFO *p8inf;

doc/apps/smime.pod

+7 −4
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ B<openssl> B<smime> 
[B<-rc2-40>]

[B<-rc2-64>]

[B<-rc2-128>]

[B<-aes128>]

[B<-aes192>]

[B<-aes256>]

[B<-in file>]

[B<-certfile file>]

[B<-signer file>]
@@ -126,11 +129,11 @@ B<-verify>. This directory must be a standard certificate directory: that 
is a hash of each subject name (using B<x509 -hash>) should be linked

to each certificate.



=item B<-des -des3 -rc2-40 -rc2-64 -rc2-128>

=item B<-des -des3 -rc2-40 -rc2-64 -rc2-128 -aes128 -aes192 -aes256>



the encryption algorithm to use. DES (56 bits), triple DES (168 bits)

or 40, 64 or 128 bit RC2 respectively if not specified 40 bit RC2 is

used. Only used with B<-encrypt>.

the encryption algorithm to use. DES (56 bits), triple DES (168 bits),

40, 64 or 128 bit RC2 or 128, 192 or 256 bit AES respectively.  If not

specified 40 bit RC2 is used. Only used with B<-encrypt>.



=item B<-nointern>