git.librecmc.org Git - oweals/openssl.git/commit

projects / oweals / openssl.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 8c6c507) | patch

author	Matt Caswell <matt@openssl.org>
	Wed, 12 Oct 2016 09:56:29 +0000 (10:56 +0100)
committer	Matt Caswell <matt@openssl.org>
	Fri, 4 Nov 2016 10:38:54 +0000 (10:38 +0000)
commit	7b73b7beda88501b9d6e062a5dbf9a72f791dfda
tree	b543407170dba31204f5afc0015fec5dff1eb163	tree \| snapshot
parent	8c6c5077b211ea73223c950edff98f0891853dc8	commit \| diff

Rebase shim against latest boringssl code

Numerous conflicts resolved. rebase was against commit 490469f850.

Reviewed-by: Richard Levitte <levitte@openssl.org>

test/ossl_shim/Makefile		diff \| blob \| history
test/ossl_shim/async_bio.cc		diff \| blob \| history
test/ossl_shim/async_bio.h		diff \| blob \| history
test/ossl_shim/crypto/scoped_types.h	[deleted file]	blob \| history
test/ossl_shim/include/openssl/base.h	[new file with mode: 0644]	blob
test/ossl_shim/ossl_shim.cc		diff \| blob \| history
test/ossl_shim/packeted_bio.cc		diff \| blob \| history
test/ossl_shim/packeted_bio.h		diff \| blob \| history
test/ossl_shim/test_config.cc		diff \| blob \| history
test/ossl_shim/test_config.h		diff \| blob \| history

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