[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  e5ecfcc788c8d3e6cbb96bc68b5498be8198f9f5 (commit)
      from  23f3993127c0a05651e28701d91edb478ebe6efa (commit)


- Log -----------------------------------------------------------------
commit e5ecfcc788c8d3e6cbb96bc68b5498be8198f9f5
Author: Pauli <paul.dale at oracle.com>
Date:   Sat Nov 23 08:04:38 2019 +1000

    Property: fix intermittent test failure.
    
    The reduction in the cache flush threshold in #10408 caused the stochastic test
    to fail with noticeable probability.  Revert that part of the change.
    
    Also add a comment to help avoid this in future.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10505)

-----------------------------------------------------------------------

Summary of changes:
 crypto/property/property.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/crypto/property/property.c b/crypto/property/property.c
index 20d1a75856..33e7469351 100644
--- a/crypto/property/property.c
+++ b/crypto/property/property.c
@@ -21,8 +21,12 @@
 #include "crypto/sparse_array.h"
 #include "property_local.h"
 
-/* The number of elements in the query cache before we initiate a flush */
-#define IMPL_CACHE_FLUSH_THRESHOLD  50
+/*
+ * The number of elements in the query cache before we initiate a flush.
+ * If reducing this, also ensure the stochastic test in test/property_test.c
+ * isn't likely to fail.
+ */
+#define IMPL_CACHE_FLUSH_THRESHOLD  500
 
 typedef struct {
     void *method;