From 600703f4f4d4bbe7016a8704a0f2195e370648c0 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 4 Oct 2019 15:37:14 +0200 Subject: [PATCH] Cleanup: move provider mains up providers/default/defltprov.c and providers/legacy/legacyprov.c are moved up to providers/ and providers/build.info is adjusted accordingly. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/10088) --- providers/build.info | 8 ++++---- providers/default/build.info | 2 -- providers/{default => }/defltprov.c | 0 providers/legacy/build.info | 7 ------- providers/{legacy => }/legacyprov.c | 0 5 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 providers/default/build.info rename providers/{default => }/defltprov.c (100%) delete mode 100644 providers/legacy/build.info rename providers/{legacy => }/legacyprov.c (100%) diff --git a/providers/build.info b/providers/build.info index 42b9c0aa9c..c31c4271de 100644 --- a/providers/build.info +++ b/providers/build.info @@ -28,7 +28,7 @@ # FIPS_MODE undefined. The default and legacy # providers use this. -SUBDIRS=common default implementations +SUBDIRS=common implementations INCLUDE[../libcrypto]=common/include @@ -82,6 +82,7 @@ LIBS{noinst}=$LIBNONFIPS $LIBIMPLEMENTATIONS # with DEPEND. $DEFAULTGOAL=../libcrypto SOURCE[$DEFAULTGOAL]=$LIBIMPLEMENTATIONS $LIBNONFIPS +SOURCE[$DEFAULTGOAL]=defltprov.c # Some legacy implementations depend on provider header files INCLUDE[../libcrypto]=implementations/include @@ -117,7 +118,6 @@ ENDIF # IF[{- !$disabled{legacy} -}] # The legacy implementation library - SUBDIRS=legacy LIBS{noinst}=$LIBLEGACY DEPEND[$LIBLEGACY]=$LIBCOMMON $LIBNONFIPS @@ -147,6 +147,6 @@ IF[{- !$disabled{legacy} -}] # Common things that are valid no matter what form the Legacy provider # takes. - INCLUDE[$LEGACYGOAL]=../include common/include + SOURCE[$LEGACYGOAL]=legacyprov.c + INCLUDE[$LEGACYGOAL]=../include implementations/include ENDIF - diff --git a/providers/default/build.info b/providers/default/build.info deleted file mode 100644 index 139590ae45..0000000000 --- a/providers/default/build.info +++ /dev/null @@ -1,2 +0,0 @@ -$GOAL=../../libcrypto -SOURCE[$GOAL]=defltprov.c diff --git a/providers/default/defltprov.c b/providers/defltprov.c similarity index 100% rename from providers/default/defltprov.c rename to providers/defltprov.c diff --git a/providers/legacy/build.info b/providers/legacy/build.info deleted file mode 100644 index 1236f15818..0000000000 --- a/providers/legacy/build.info +++ /dev/null @@ -1,7 +0,0 @@ -IF[{- $disabled{module} -}] - $GOAL=../../libcrypto -ELSE - $GOAL=../legacy -ENDIF - -SOURCE[$GOAL]=legacyprov.c diff --git a/providers/legacy/legacyprov.c b/providers/legacyprov.c similarity index 100% rename from providers/legacy/legacyprov.c rename to providers/legacyprov.c -- 2.25.1