This brings the subtree up to date with the latest master after merging https://github.com/bitcoin-core/ctaes/pull/5.
Update comments in ctaes #9303
pull sipa wants to merge 2 commits into bitcoin:master from sipa:ctaes changing 1 files +4 −4-
sipa commented at 1:09 AM on December 9, 2016: member
-
8501bedd75
Squashed 'src/crypto/ctaes/' changes from cd3c3ac..003a4ac
003a4ac Merge #5: fix typo 5254f14 [trivial] Fix typo e7c0aab Merge #4: Fix some comments d07cead Fix some comments git-subtree-dir: src/crypto/ctaes git-subtree-split: 003a4acfc273932ab8c2e276cde3b4f3541012dd
-
Update ctaes 760765d5a9
-
gmaxwell commented at 1:16 AM on December 9, 2016: contributor
utACK.
- fanquake added the label Docs and Output on Dec 9, 2016
- sipa requested review from MarcoFalke on Dec 9, 2016
-
instagibbs commented at 1:59 AM on December 9, 2016: member
I think you mean bitcoin-core/ctaes#4.
-
sipa commented at 2:19 AM on December 9, 2016: member
Actually, no. We have made a change in our local tree in Bitcoin Core, which was then applird in PR5 in ctaes as well. This synchronizes the subtree with the ctaes after the merge of PR5.
- jonasschnelli approved
-
jonasschnelli commented at 7:36 AM on December 9, 2016: contributor
ACK 760765d5a982464cdecc352c0eb42ea6836aee16
- MarcoFalke merged this on Dec 9, 2016
- MarcoFalke closed this on Dec 9, 2016
- MarcoFalke referenced this in commit 72bf1b3d09 on Dec 9, 2016
-
MarcoFalke commented at 9:24 AM on December 9, 2016: member
Before:
$ ./contrib/devtools/git-subtree-check.sh src/crypto/ctaes src/crypto/ctaes in HEAD was last updated to upstream commit cd3c3ac31fac41cc253bf5780b55ecd8d7368545 (tree a0c8e75d42b565fdecd0617aec69c7e3d6c79232) src/crypto/ctaes in HEAD currently refers to tree 38fa0e6d26ed207fa48ef03829a194e01fbbfeea :100644 100644 21439a16f136e7fba253f950b8d9dfd5f30bbfa6 fce1696acdc2db618cc88c288b190a567d8f9e1c M test.c FAIL: subtree directory tree doesn't match subtree commit treeAfter:
$ ./contrib/devtools/git-subtree-check.sh src/crypto/ctaes src/crypto/ctaes in HEAD was last updated to upstream commit 003a4acfc273932ab8c2e276cde3b4f3541012dd (tree 1b6c31139a71f80245c09597c343936a8e41d021) src/crypto/ctaes in HEAD currently refers to tree 1b6c31139a71f80245c09597c343936a8e41d021 GOODACK
- codablock referenced this in commit cc0bcf1fe1 on Jan 16, 2018
- codablock referenced this in commit d2f3a96807 on Jan 16, 2018
- codablock referenced this in commit 45727e7974 on Jan 17, 2018
- andvgal referenced this in commit b635f0e3b5 on Jan 6, 2019
- CryptoCentric referenced this in commit a7911b125f on Feb 25, 2019
- DrahtBot locked this on Feb 15, 2022