diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-10-04 15:37:14 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-10-10 14:12:15 +0200 |
| commit | 600703f4f4d4bbe7016a8704a0f2195e370648c0 (patch) | |
| tree | 5212387130f6d6f7aaa1becffad2e1129e1a7fba | |
| parent | ddd21319e94636f308e115fd05cc48e7a8eadc55 (diff) | |
| download | openssl-new-600703f4f4d4bbe7016a8704a0f2195e370648c0.tar.gz | |
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 <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10088)
| -rw-r--r-- | providers/build.info | 8 | ||||
| -rw-r--r-- | providers/default/build.info | 2 | ||||
| -rw-r--r-- | providers/defltprov.c (renamed from providers/default/defltprov.c) | 0 | ||||
| -rw-r--r-- | providers/legacy/build.info | 7 | ||||
| -rw-r--r-- | providers/legacyprov.c (renamed from providers/legacy/legacyprov.c) | 0 |
5 files changed, 4 insertions, 13 deletions
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 index 7dd0cf5012..7dd0cf5012 100644 --- a/providers/default/defltprov.c +++ b/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 index 11a050e203..11a050e203 100644 --- a/providers/legacy/legacyprov.c +++ b/providers/legacyprov.c |