[openssl-commits] [openssl] master update

[Paul I. Dale]

The branch master has been updated
       via  275a7b9e5eef3af2834b734b42c5054149ff5e87 (commit)
      from  72818ef0055c79fb4d9ecc3844d117e6c9ae314c (commit)


- Log -----------------------------------------------------------------
commit 275a7b9e5eef3af2834b734b42c5054149ff5e87
Author: nxtstep <code at supersimple.io>
Date:   Mon Dec 10 10:39:24 2018 +0100

    typo ANS1 -> ASN1
    
    CLA: trivial
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7857)

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

Summary of changes:
 CHANGES                       | 2 +-
 crypto/asn1/a_utctm.c         | 2 +-
 test/asn1_string_table_test.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0770f55..42bd6ee 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11496,7 +11496,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      (still largely untested)
      [Bodo Moeller]
 
-  *) New function ANS1_tag2str() to convert an ASN1 tag to a descriptive
+  *) New function ASN1_tag2str() to convert an ASN1 tag to a descriptive
      ASCII string. This was handled independently in various places before.
      [Steve Henson]
 
diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index 930e7f9..000cd4b 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -16,7 +16,7 @@
 /* This is the primary function used to parse ASN1_UTCTIME */
 int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d)
 {
-    /* wrapper around ans1_time_to_tm */
+    /* wrapper around asn1_time_to_tm */
     if (d->type != V_ASN1_UTCTIME)
         return 0;
     return asn1_time_to_tm(tm, d);
diff --git a/test/asn1_string_table_test.c b/test/asn1_string_table_test.c
index 4f14a31..5c3501b 100644
--- a/test/asn1_string_table_test.c
+++ b/test/asn1_string_table_test.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* Tests for the ANS1_STRING_TABLE_* functions */
+/* Tests for the ASN1_STRING_TABLE_* functions */
 
 #include <stdio.h>
 #include <string.h>