diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-05-19 10:01:25 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-05-20 16:23:27 +0200 |
| commit | ee56cec7332ca2c77ee425c544304ce25475db1c (patch) | |
| tree | e52fcf8583a66be15fa5b2cab6820f1ca0052ee0 | |
| parent | a37dbb466ce085bd054bf13604dceac6eb35b593 (diff) | |
CMP test server: move apps/{,lib/}cmp_mock_srv.c and apps/{,include/}cmp_mock_srv.h
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15343)
| -rw-r--r-- | apps/build.info | 2 | ||||
| -rw-r--r-- | apps/include/cmp_mock_srv.h (renamed from apps/cmp_mock_srv.h) | 0 | ||||
| -rw-r--r-- | apps/lib/cmp_mock_srv.c (renamed from apps/cmp_mock_srv.c) | 0 | ||||
| -rw-r--r-- | test/build.info | 2 | ||||
| -rw-r--r-- | test/cmp_client_test.c | 2 | ||||
| -rwxr-xr-x | util/find-doc-nits | 2 |
6 files changed, 4 insertions, 4 deletions
diff --git a/apps/build.info b/apps/build.info index 308f4d94f8..020d129f8c 100644 --- a/apps/build.info +++ b/apps/build.info @@ -52,7 +52,7 @@ IF[{- !$disabled{'cms'} -}] $OPENSSLSRC=$OPENSSLSRC cms.c ENDIF IF[{- !$disabled{'cmp'} -}] - $OPENSSLSRC=$OPENSSLSRC cmp.c cmp_mock_srv.c + $OPENSSLSRC=$OPENSSLSRC cmp.c lib/cmp_mock_srv.c ENDIF IF[{- !$disabled{apps} -}] diff --git a/apps/cmp_mock_srv.h b/apps/include/cmp_mock_srv.h index 7c844a5391..7c844a5391 100644 --- a/apps/cmp_mock_srv.h +++ b/apps/include/cmp_mock_srv.h diff --git a/apps/cmp_mock_srv.c b/apps/lib/cmp_mock_srv.c index 1e6a27210c..1e6a27210c 100644 --- a/apps/cmp_mock_srv.c +++ b/apps/lib/cmp_mock_srv.c diff --git a/test/build.info b/test/build.info index 842a7bbe35..58d75be5d4 100644 --- a/test/build.info +++ b/test/build.info @@ -529,7 +529,7 @@ IF[{- !$disabled{tests} -}] INCLUDE[cmp_server_test]=.. ../include ../apps/include DEPEND[cmp_server_test]=../libcrypto.a libtestutil.a - SOURCE[cmp_client_test]=cmp_client_test.c helpers/cmp_testlib.c ../apps/cmp_mock_srv.c + SOURCE[cmp_client_test]=cmp_client_test.c helpers/cmp_testlib.c ../apps/lib/cmp_mock_srv.c INCLUDE[cmp_client_test]=.. ../include ../apps/include DEPEND[cmp_client_test]=../libcrypto.a libtestutil.a diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c index 35a7c30f92..3d9b37b3a2 100644 --- a/test/cmp_client_test.c +++ b/test/cmp_client_test.c @@ -11,7 +11,7 @@ #include "helpers/cmp_testlib.h" -#include "apps/cmp_mock_srv.h" +#include "cmp_mock_srv.h" #ifndef NDEBUG /* tests need mock server, which is available only if !NDEBUG */ diff --git a/util/find-doc-nits b/util/find-doc-nits index fd465f6d0b..815880ad01 100755 --- a/util/find-doc-nits +++ b/util/find-doc-nits @@ -1128,7 +1128,7 @@ if ( $opt_c ) { # See if each has a manpage. foreach my $cmd ( @commands ) { $cmd =~ s/\.c$//; - next if $cmd eq 'progs' || $cmd eq 'cmp_mock_srv' || $cmd eq 'vms_decc_init'; + next if $cmd eq 'progs' || $cmd eq 'vms_decc_init'; my @doc = ( grep { basename($_) eq "openssl-$cmd.pod" # For "tsget" and "CA.pl" pod pages || basename($_) eq "$cmd.pod" } |