Update the early_secret generation to use the new ticket_nonce field

[openssl.git] / crypto / cryptlib.c

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 71a5c35974e66add8ec9769fa588ee9ce16c76e7..4fe6a451406ce97c9d6edbd49cd1e6d0ef2853d9 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -7,12 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
 #include "internal/cryptlib_int.h"
 #include <openssl/safestack.h>
 
@@ -321,6 +316,7 @@ void OPENSSL_die(const char *message, const char *file, int line)
  *
  * There are also assembler versions of this function.
  */
+# undef CRYPTO_memcmp
 int CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len)
 {
     size_t i;