Add move support to EVP_MD_CTX.
We'll need to maintain two transcripts on the ECH client and then, once
we know which of ClientHelloOuter or ClientHelloInner is used, overwrite
the default transcript with the alternate one.
Rather than indirect through a pointer, move support is easy enough.
Then this can just be hs->transcript = std::move(hs->inner_transcript).
Bug: 275
Change-Id: Id4b0a0a48b956cd65ce8fc3dacfd16eebe2eb778
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/47993
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/include/openssl/base.h b/include/openssl/base.h
index 66d0493..d37c202 100644
--- a/include/openssl/base.h
+++ b/include/openssl/base.h
@@ -537,8 +537,39 @@
StackAllocated() { init(&ctx_); }
~StackAllocated() { cleanup(&ctx_); }
- StackAllocated(const StackAllocated<T, CleanupRet, init, cleanup> &) = delete;
- T& operator=(const StackAllocated<T, CleanupRet, init, cleanup> &) = delete;
+ StackAllocated(const StackAllocated &) = delete;
+ StackAllocated& operator=(const StackAllocated &) = delete;
+
+ T *get() { return &ctx_; }
+ const T *get() const { return &ctx_; }
+
+ T *operator->() { return &ctx_; }
+ const T *operator->() const { return &ctx_; }
+
+ void Reset() {
+ cleanup(&ctx_);
+ init(&ctx_);
+ }
+
+ private:
+ T ctx_;
+};
+
+template <typename T, typename CleanupRet, void (*init)(T *),
+ CleanupRet (*cleanup)(T *), void (*move)(T *, T *)>
+class StackAllocatedMovable {
+ public:
+ StackAllocatedMovable() { init(&ctx_); }
+ ~StackAllocatedMovable() { cleanup(&ctx_); }
+
+ StackAllocatedMovable(StackAllocatedMovable &&other) {
+ init(&ctx_);
+ move(&ctx_, &other.ctx_);
+ }
+ StackAllocatedMovable &operator=(StackAllocatedMovable &&other) {
+ move(&ctx_, &other.ctx_);
+ return *this;
+ }
T *get() { return &ctx_; }
const T *get() const { return &ctx_; }
