Rebase shim against latest boringssl code

all: ossl_shim

ossl_shim: ../../libssl.a ../../libcrypto.a *.cc

	g++ -g -std=c++11 -I. -I../../include *.cc \

	g++ -g -std=c++11 -I. -Iinclude -I../../include *.cc \

	../../libssl.a ../../libcrypto.a -ldl -lpthread \

	-o ossl_shim

#include <errno.h>

#include <string.h>

#include <openssl/bio.h>

#include <openssl/crypto.h>

}  // namespace

ScopedBIO AsyncBioCreate() {

  return ScopedBIO(BIO_new(AsyncMethod()));

bssl::UniquePtr<BIO> AsyncBioCreate() {

  return bssl::UniquePtr<BIO>(BIO_new(AsyncMethod()));

}

ScopedBIO AsyncBioCreateDatagram() {

  ScopedBIO ret(BIO_new(AsyncMethod()));

bssl::UniquePtr<BIO> AsyncBioCreateDatagram() {

  bssl::UniquePtr<BIO> ret(BIO_new(AsyncMethod()));

  if (!ret) {

    return nullptr;

  }

#ifndef HEADER_ASYNC_BIO

#define HEADER_ASYNC_BIO

#include <openssl/base.h>

#include <openssl/bio.h>

#include "crypto/scoped_types.h"

// AsyncBioCreate creates a filter BIO for testing asynchronous state

// machines which consume a stream socket. Reads and writes will fail

// and return EAGAIN unless explicitly allowed. Each async BIO has a

// read quota and a write quota. Initially both are zero. As each is

// incremented, bytes are allowed to flow through the BIO.

ScopedBIO AsyncBioCreate();

bssl::UniquePtr<BIO> AsyncBioCreate();

// AsyncBioCreateDatagram creates a filter BIO for testing for

// asynchronous state machines which consume datagram sockets. The read

// and write quota count in packets rather than bytes.

ScopedBIO AsyncBioCreateDatagram();

bssl::UniquePtr<BIO> AsyncBioCreateDatagram();

// AsyncBioAllowRead increments |bio|'s read quota by |count|.

void AsyncBioAllowRead(BIO *bio, size_t count);

/* Copyright (c) 2015, Google Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

 * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */

#ifndef OPENSSL_HEADER_CRYPTO_TEST_SCOPED_TYPES_H

#define OPENSSL_HEADER_CRYPTO_TEST_SCOPED_TYPES_H

#include <stdint.h>

#include <stdio.h>

#include <memory>

#include <openssl/asn1.h>

#include <openssl/bio.h>

#include <openssl/bn.h>

#include <openssl/crypto.h>

#include <openssl/cmac.h>

#include <openssl/dh.h>

#include <openssl/ecdsa.h>

#include <openssl/ec.h>

#include <openssl/evp.h>

#include <openssl/pkcs12.h>

#include <openssl/rsa.h>

#include <openssl/stack.h>

#include <openssl/x509.h>

template<typename T, void (*func)(T*)>

struct OpenSSLDeleter {

  void operator()(T *obj) {

    func(obj);

  }

};

template<typename StackType, typename T, void (*func)(T*)>

struct OpenSSLStackDeleter {

  void operator()(StackType *obj) {

    sk_pop_free(reinterpret_cast<_STACK*>(obj),

                reinterpret_cast<void (*)(void *)>(func));

  }

};

template<typename T>

struct OpenSSLFree {

  void operator()(T *buf) {

    OPENSSL_free(buf);

  }

};

struct FileCloser {

  void operator()(FILE *file) {

    fclose(file);

  }

};

template<typename T, void (*func)(T*)>

using ScopedOpenSSLType = std::unique_ptr<T, OpenSSLDeleter<T, func>>;

template<typename StackType, typename T, void (*func)(T*)>

using ScopedOpenSSLStack =

    std::unique_ptr<StackType, OpenSSLStackDeleter<StackType, T, func>>;

using ScopedASN1_TYPE = ScopedOpenSSLType<ASN1_TYPE, ASN1_TYPE_free>;

using ScopedBIO = ScopedOpenSSLType<BIO, BIO_vfree>;

using ScopedBIGNUM = ScopedOpenSSLType<BIGNUM, BN_free>;

using ScopedBN_CTX = ScopedOpenSSLType<BN_CTX, BN_CTX_free>;

using ScopedBN_MONT_CTX = ScopedOpenSSLType<BN_MONT_CTX, BN_MONT_CTX_free>;

using ScopedCMAC_CTX = ScopedOpenSSLType<CMAC_CTX, CMAC_CTX_free>;

using ScopedDH = ScopedOpenSSLType<DH, DH_free>;

using ScopedECDSA_SIG = ScopedOpenSSLType<ECDSA_SIG, ECDSA_SIG_free>;

using ScopedEC_GROUP = ScopedOpenSSLType<EC_GROUP, EC_GROUP_free>;

using ScopedEC_KEY = ScopedOpenSSLType<EC_KEY, EC_KEY_free>;

using ScopedEC_POINT = ScopedOpenSSLType<EC_POINT, EC_POINT_free>;

using ScopedEVP_PKEY = ScopedOpenSSLType<EVP_PKEY, EVP_PKEY_free>;

using ScopedEVP_PKEY_CTX = ScopedOpenSSLType<EVP_PKEY_CTX, EVP_PKEY_CTX_free>;

using ScopedPKCS8_PRIV_KEY_INFO = ScopedOpenSSLType<PKCS8_PRIV_KEY_INFO,

                                                    PKCS8_PRIV_KEY_INFO_free>;

using ScopedPKCS12 = ScopedOpenSSLType<PKCS12, PKCS12_free>;

using ScopedRSA = ScopedOpenSSLType<RSA, RSA_free>;

using ScopedX509 = ScopedOpenSSLType<X509, X509_free>;

using ScopedX509_ALGOR = ScopedOpenSSLType<X509_ALGOR, X509_ALGOR_free>;

using ScopedX509_SIG = ScopedOpenSSLType<X509_SIG, X509_SIG_free>;

using ScopedX509_STORE_CTX = ScopedOpenSSLType<X509_STORE_CTX, X509_STORE_CTX_free>;

using ScopedX509Stack = ScopedOpenSSLStack<STACK_OF(X509), X509, X509_free>;

using ScopedOpenSSLBytes = std::unique_ptr<uint8_t, OpenSSLFree<uint8_t>>;

using ScopedOpenSSLString = std::unique_ptr<char, OpenSSLFree<char>>;

using ScopedFILE = std::unique_ptr<FILE, FileCloser>;

#endif  // OPENSSL_HEADER_CRYPTO_TEST_SCOPED_TYPES_H

/* ====================================================================

 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer. 

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    openssl-core@openssl.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com). */

#ifndef OPENSSL_HEADER_BASE_H

#define OPENSSL_HEADER_BASE_H

/* Needed for BORINGSSL_MAKE_DELETER */

# include <openssl/bio.h>

# include <openssl/evp.h>

# include <openssl/dh.h>

# include <openssl/x509.h>

# include <openssl/ssl.h>

# define OPENSSL_ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))

/* Temporary TLS1.3 defines until OpenSSL supports these */

# define TLS1_3_VERSION                  0x0304

# define SSL_OP_NO_TLSv1_3               0

extern "C++" {

#include <memory>

namespace bssl {

namespace internal {

template <typename T>

struct DeleterImpl {};

template <typename T>

struct Deleter {

  void operator()(T *ptr) {

    // Rather than specialize Deleter for each type, we specialize

    // DeleterImpl. This allows bssl::UniquePtr<T> to be used while only

    // including base.h as long as the destructor is not emitted. This matches

    // std::unique_ptr's behavior on forward-declared types.

    //

    // DeleterImpl itself is specialized in the corresponding module's header

    // and must be included to release an object. If not included, the compiler

    // will error that DeleterImpl<T> does not have a method Free.

    DeleterImpl<T>::Free(ptr);

  }

};

template <typename T, typename CleanupRet, void (*init)(T *),

          CleanupRet (*cleanup)(T *)>

class StackAllocated {

 public:

  StackAllocated() { init(&ctx_); }

  ~StackAllocated() { cleanup(&ctx_); }

  StackAllocated(const StackAllocated<T, CleanupRet, init, cleanup> &) = delete;

  T& operator=(const StackAllocated<T, CleanupRet, init, cleanup> &) = delete;

  T *get() { return &ctx_; }

  const T *get() const { return &ctx_; }

  void Reset() {

    cleanup(&ctx_);

    init(&ctx_);

  }

 private:

  T ctx_;

};

}  // namespace internal

#define BORINGSSL_MAKE_DELETER(type, deleter)     \

  namespace internal {                            \

  template <>                                     \

  struct DeleterImpl<type> {                      \

    static void Free(type *ptr) { deleter(ptr); } \

  };                                              \

  }

// This makes a unique_ptr to STACK_OF(type) that owns all elements on the

// stack, i.e. it uses sk_pop_free() to clean up.

#define BORINGSSL_MAKE_STACK_DELETER(type, deleter) \

  namespace internal {                              \

  template <>                                       \

  struct DeleterImpl<STACK_OF(type)> {              \

    static void Free(STACK_OF(type) *ptr) {         \

      sk_##type##_pop_free(ptr, deleter);           \

    }                                               \

  };                                                \

  }

// Holds ownership of heap-allocated BoringSSL structures. Sample usage:

//   bssl::UniquePtr<BIO> rsa(RSA_new());

//   bssl::UniquePtr<BIO> bio(BIO_new(BIO_s_mem()));

template <typename T>

using UniquePtr = std::unique_ptr<T, internal::Deleter<T>>;

BORINGSSL_MAKE_DELETER(BIO, BIO_free)

BORINGSSL_MAKE_DELETER(EVP_PKEY, EVP_PKEY_free)

BORINGSSL_MAKE_DELETER(DH, DH_free)

BORINGSSL_MAKE_DELETER(X509, X509_free)

BORINGSSL_MAKE_DELETER(SSL, SSL_free)

BORINGSSL_MAKE_DELETER(SSL_CTX, SSL_CTX_free)

BORINGSSL_MAKE_DELETER(SSL_SESSION, SSL_SESSION_free)

}  // namespace bssl

}  /* extern C++ */

#endif  /* OPENSSL_HEADER_BASE_H */