[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  1514f7cea3428e453d900e36a0b6d0c2778c0296 (commit)
      from  a0a760ccf04c05b9a7b8b7a5b3a06a626a297362 (commit)


- Log -----------------------------------------------------------------
commit 1514f7cea3428e453d900e36a0b6d0c2778c0296
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri May 19 21:27:58 2017 -0400

    Move engines/afalg to engines
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3491)

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

Summary of changes:
 engines/afalg/build.info          | 13 -------------
 engines/build.info                | 10 ++++++++++
 engines/{afalg => }/e_afalg.c     |  0
 engines/{afalg => }/e_afalg.ec    |  0
 engines/{afalg => }/e_afalg.h     |  0
 engines/{afalg => }/e_afalg_err.c |  0
 engines/{afalg => }/e_afalg_err.h |  0
 7 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 engines/afalg/build.info
 rename engines/{afalg => }/e_afalg.c (100%)
 rename engines/{afalg => }/e_afalg.ec (100%)
 rename engines/{afalg => }/e_afalg.h (100%)
 rename engines/{afalg => }/e_afalg_err.c (100%)
 rename engines/{afalg => }/e_afalg_err.h (100%)

diff --git a/engines/afalg/build.info b/engines/afalg/build.info
deleted file mode 100644
index 8601b1a..0000000
--- a/engines/afalg/build.info
+++ /dev/null
@@ -1,13 +0,0 @@
-IF[{- !$disabled{"engine"} -}]
-  IF[{- !$disabled{afalg} -}]
-    IF[{- $disabled{"dynamic-engine"} -}]
-      LIBS=../../libcrypto
-      SOURCE[../../libcrypto]=e_afalg.c e_afalg_err.c
-    ELSE
-      ENGINES=afalg
-      SOURCE[afalg]=e_afalg.c e_afalg_err.c
-      DEPEND[afalg]=../../libcrypto
-      INCLUDE[afalg]= ../../include
-    ENDIF
-  ENDIF
-ENDIF
diff --git a/engines/build.info b/engines/build.info
index 1c47e77..2f0c54a 100644
--- a/engines/build.info
+++ b/engines/build.info
@@ -1,4 +1,5 @@
 IF[{- !$disabled{"engine"} -}]
+
   IF[{- $disabled{"dynamic-engine"} -}]
     LIBS=../libcrypto
     SOURCE[../libcrypto]=\
@@ -6,6 +7,9 @@ IF[{- !$disabled{"engine"} -}]
     IF[{- !$disabled{capieng} -}]
       SOURCE[../libcrypto]=e_capi.c
     ENDIF
+    IF[{- !$disabled{afalgeng} -}]
+      SOURCE[../libcrypto]=e_afalg.c e_afalg_err.c
+    ENDIF
   ELSE
     ENGINES=padlock
     SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -}
@@ -17,6 +21,12 @@ IF[{- !$disabled{"engine"} -}]
       DEPEND[capi]=../libcrypto
       INCLUDE[capi]=../include
     ENDIF
+    IF[{- !$disabled{afalgeng} -}]
+      ENGINES=afalg
+      SOURCE[afalg]=e_afalg.c e_afalg_err.c
+      DEPEND[afalg]=../libcrypto
+      INCLUDE[afalg]= ../include
+    ENDIF
 
     ENGINES_NO_INST=ossltest dasync
     SOURCE[dasync]=e_dasync.c
diff --git a/engines/afalg/e_afalg.c b/engines/e_afalg.c
similarity index 100%
rename from engines/afalg/e_afalg.c
rename to engines/e_afalg.c
diff --git a/engines/afalg/e_afalg.ec b/engines/e_afalg.ec
similarity index 100%
rename from engines/afalg/e_afalg.ec
rename to engines/e_afalg.ec
diff --git a/engines/afalg/e_afalg.h b/engines/e_afalg.h
similarity index 100%
rename from engines/afalg/e_afalg.h
rename to engines/e_afalg.h
diff --git a/engines/afalg/e_afalg_err.c b/engines/e_afalg_err.c
similarity index 100%
rename from engines/afalg/e_afalg_err.c
rename to engines/e_afalg_err.c
diff --git a/engines/afalg/e_afalg_err.h b/engines/e_afalg_err.h
similarity index 100%
rename from engines/afalg/e_afalg_err.h
rename to engines/e_afalg_err.h