granicus.if.org Git - openssl/commit

]> granicus.if.org Git - openssl/commit

author	Dr. Stephen Henson <steve@openssl.org>
	Wed, 20 May 2015 23:37:39 +0000 (00:37 +0100)
committer	Dr. Stephen Henson <steve@openssl.org>
	Tue, 26 May 2015 12:09:26 +0000 (13:09 +0100)
commit	6355d31538fb3d50ba34210e6514cfac1c627243
tree	b375f4c6110572be6a487c38a10ec36080224656	tree \| snapshot
parent	fef034f85ea8b533423d4102cb8f83ef0ac24154	commit \| diff

Add function PKCS8_set0_pbe

This adds a new function which will encrypt a private key using PKCS#8
based on an X509_ALGOR structure and reimplements PKCS8_encrypt to use it.

Update pkcs8 utlity to use PKCS8_set0_pbe.

Reviewed-by: Rich Salz <rsalz@openssl.org>

apps/pkcs8.c		diff \| blob \| history
crypto/pkcs12/p12_p8e.c		diff \| blob \| history
crypto/pkcs12/pk12err.c		diff \| blob \| history
include/openssl/pkcs12.h		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom