[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a8f6d2642d1b011961022a5d9aa9e1156097b85c (commit)
      from  0ddf74bf1c47b554c3d2c086ff2acb18bcc81bc6 (commit)


- Log -----------------------------------------------------------------
commit a8f6d2642d1b011961022a5d9aa9e1156097b85c
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Nov 8 10:29:24 2019 +0100

    Rename providers/common/provlib.c to nid_to_name.c
    
    It contains only one function, which should only get added to non-FIPS
    providers.
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10389)

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

Summary of changes:
 providers/common/build.info                   | 4 ++--
 providers/common/{provlib.c => nid_to_name.c} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename providers/common/{provlib.c => nid_to_name.c} (87%)

diff --git a/providers/common/build.info b/providers/common/build.info
index 4e662eb97a..df05c49cd2 100644
--- a/providers/common/build.info
+++ b/providers/common/build.info
@@ -1,6 +1,6 @@
 SUBDIRS=digests ciphers
 
-SOURCE[../libcommon.a]=provider_err.c provlib.c
+SOURCE[../libcommon.a]=provider_err.c
 $FIPSCOMMON=provider_util.c
-SOURCE[../libnonfips.a]=$FIPSCOMMON
+SOURCE[../libnonfips.a]=$FIPSCOMMON nid_to_name.c
 SOURCE[../libfips.a]=$FIPSCOMMON
diff --git a/providers/common/provlib.c b/providers/common/nid_to_name.c
similarity index 87%
rename from providers/common/provlib.c
rename to providers/common/nid_to_name.c
index e754b84d35..af2a7cbc6a 100644
--- a/providers/common/provlib.c
+++ b/providers/common/nid_to_name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy