[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  69b86d4b98051af62d44b2ccf0a4cab7c8aa8ff9 (commit)
      from  1bb7310bf8d62e5a6f4f82b34f249d86b8e42377 (commit)


- Log -----------------------------------------------------------------
commit 69b86d4b98051af62d44b2ccf0a4cab7c8aa8ff9
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Fri Aug 12 00:29:27 2016 +0200

    two typo fixes
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1461)

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

Summary of changes:
 apps/ca.c   | 2 +-
 test/README | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/ca.c b/apps/ca.c
index 4b4b37d..4bf7b52 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -83,7 +83,7 @@
 
 /* Additional revocation information types */
 
-#define REV_NONE                0 /* No addditional information */
+#define REV_NONE                0 /* No additional information */
 #define REV_CRL_REASON          1 /* Value is CRL reason code */
 #define REV_HOLD                2 /* Value is hold instruction */
 #define REV_KEY_COMPROMISE      3 /* Value is cert key compromise time */
diff --git a/test/README b/test/README
index 8df35fe..34ef29a 100644
--- a/test/README
+++ b/test/README
@@ -9,7 +9,7 @@ Please note that if a test involves a new testing executable, you will need to
 do some additions in test/Makefile.  More on this later.
 
 
-Naming convetions
+Naming conventions
 =================
 
 A test executable is named test/{name}test.c