Module: wine Branch: master Commit: 4f3dbb7f7d6b7da9bcdb92189fae5fbe4abfb261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3dbb7f7d6b7da9bcdb92189f...
Author: Paul Vriens paul.vriens.wine@gmail.com Date: Fri Apr 4 08:12:13 2008 +0200
rsabase: Remove rsabase tests as they are covered in rsaenh.
---
.gitignore | 4 -- Makefile.in | 2 - configure | 3 - configure.ac | 1 - dlls/Makefile.in | 1 - dlls/rsabase/tests/Makefile.in | 13 ------ dlls/rsabase/tests/rsabase.c | 84 ---------------------------------------- programs/winetest/Makefile.in | 3 - programs/winetest/winetest.rc | 1 - 9 files changed, 0 insertions(+), 112 deletions(-)
diff --git a/.gitignore b/.gitignore index 7837b5b..dc40bde 100644 --- a/.gitignore +++ b/.gitignore @@ -350,9 +350,6 @@ dlls/rpcrt4/tests/server.h dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/rpcrt4/tests/testlist.c -dlls/rsabase/tests/*.ok -dlls/rsabase/tests/rsabase_crosstest.exe -dlls/rsabase/tests/testlist.c dlls/rsaenh/librsaenh.def dlls/rsaenh/tests/*.ok dlls/rsaenh/tests/rsaenh_crosstest.exe @@ -673,7 +670,6 @@ programs/winetest/quartz_test.exe programs/winetest/riched20_test.exe programs/winetest/riched32_test.exe programs/winetest/rpcrt4_test.exe -programs/winetest/rsabase_test.exe programs/winetest/rsaenh_test.exe programs/winetest/schannel_test.exe programs/winetest/secur32_test.exe diff --git a/Makefile.in b/Makefile.in index b8962a9..cc9211d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -412,7 +412,6 @@ ALL_MAKEFILES = \ dlls/rpcrt4/Makefile \ dlls/rpcrt4/tests/Makefile \ dlls/rsabase/Makefile \ - dlls/rsabase/tests/Makefile \ dlls/rsaenh/Makefile \ dlls/rsaenh/tests/Makefile \ dlls/sane.ds/Makefile \ @@ -837,7 +836,6 @@ dlls/riched32/tests/Makefile: dlls/riched32/tests/Makefile.in dlls/Maketest.rule dlls/rpcrt4/Makefile: dlls/rpcrt4/Makefile.in dlls/Makedll.rules dlls/rpcrt4/tests/Makefile: dlls/rpcrt4/tests/Makefile.in dlls/Maketest.rules dlls/rsabase/Makefile: dlls/rsabase/Makefile.in dlls/Makedll.rules -dlls/rsabase/tests/Makefile: dlls/rsabase/tests/Makefile.in dlls/Maketest.rules dlls/rsaenh/Makefile: dlls/rsaenh/Makefile.in dlls/Makedll.rules dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules dlls/sane.ds/Makefile: dlls/sane.ds/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 86b9bf0..a0f73f8 100755 --- a/configure +++ b/configure @@ -21772,8 +21772,6 @@ ac_config_files="$ac_config_files dlls/rpcrt4/tests/Makefile"
ac_config_files="$ac_config_files dlls/rsabase/Makefile"
-ac_config_files="$ac_config_files dlls/rsabase/tests/Makefile" - ac_config_files="$ac_config_files dlls/rsaenh/Makefile"
ac_config_files="$ac_config_files dlls/rsaenh/tests/Makefile" @@ -22912,7 +22910,6 @@ do "dlls/rpcrt4/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/Makefile" ;; "dlls/rpcrt4/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/tests/Makefile" ;; "dlls/rsabase/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/Makefile" ;; - "dlls/rsabase/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/tests/Makefile" ;; "dlls/rsaenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/Makefile" ;; "dlls/rsaenh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/tests/Makefile" ;; "dlls/sane.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sane.ds/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0cab238..3e14bdc 100644 --- a/configure.ac +++ b/configure.ac @@ -1915,7 +1915,6 @@ AC_CONFIG_FILES([dlls/riched32/tests/Makefile]) AC_CONFIG_FILES([dlls/rpcrt4/Makefile]) AC_CONFIG_FILES([dlls/rpcrt4/tests/Makefile]) AC_CONFIG_FILES([dlls/rsabase/Makefile]) -AC_CONFIG_FILES([dlls/rsabase/tests/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/tests/Makefile]) AC_CONFIG_FILES([dlls/sane.ds/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index bb473e2..6f171d7 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -342,7 +342,6 @@ TESTSUBDIRS = \ riched20/tests \ riched32/tests \ rpcrt4/tests \ - rsabase/tests \ rsaenh/tests \ schannel/tests \ secur32/tests \ diff --git a/dlls/rsabase/tests/Makefile.in b/dlls/rsabase/tests/Makefile.in deleted file mode 100644 index bd5c77d..0000000 --- a/dlls/rsabase/tests/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -TESTDLL = rsabase.dll -IMPORTS = advapi32 kernel32 - -CTESTS = \ - rsabase.c - -@MAKE_TEST_RULES@ - -@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/rsabase/tests/rsabase.c b/dlls/rsabase/tests/rsabase.c deleted file mode 100644 index b7746b1..0000000 --- a/dlls/rsabase/tests/rsabase.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Unit tests for rsabase functions - * - * Copyright (c) 2004 Michael Jung - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <string.h> -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wincrypt.h" - -HCRYPTPROV hProv; -static const char szContainer[] = "Wine Test Container"; -static const char szProvider[] = MS_DEF_PROV_A; - -static int init_environment(void) -{ - hProv = (HCRYPTPROV)INVALID_HANDLE_VALUE; - - if (!CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, 0)) - { - if (GetLastError()==NTE_BAD_KEYSET) - { - if(!CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET)) - { - trace("%08x\n", GetLastError()); - return 0; - } - } - else - { - trace("%08x\n", GetLastError()); - return 0; - } - } - - return 1; -} - -static void clean_up_environment(void) -{ - CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); -} - -static void test_gen_random(void) -{ - BOOL result; - BYTE rnd1[16], rnd2[16]; - - memset(rnd1, 0, sizeof(rnd1)); - memset(rnd2, 0, sizeof(rnd2)); - - result = CryptGenRandom(hProv, sizeof(rnd1), rnd1); - ok(result, "%08x\n", GetLastError()); - - result = CryptGenRandom(hProv, sizeof(rnd2), rnd2); - ok(result, "%08x\n", GetLastError()); - - ok(memcmp(rnd1, rnd2, sizeof(rnd1)), "CryptGenRandom generates non random data\n"); -} - -START_TEST(rsabase) -{ - if (!init_environment()) - return; - test_gen_random(); - clean_up_environment(); -} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 7ccce18..5a188b6 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -83,7 +83,6 @@ TESTBINS = \ riched20_test.exe \ riched32_test.exe \ rpcrt4_test.exe \ - rsabase_test.exe \ rsaenh_test.exe \ schannel_test.exe \ secur32_test.exe \ @@ -223,8 +222,6 @@ riched32_test.exe: $(DLLDIR)/riched32/tests/riched32_test.exe$(DLLEXT) cp $(DLLDIR)/riched32/tests/riched32_test.exe$(DLLEXT) $@ && $(STRIP) $@ rpcrt4_test.exe: $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) cp $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) $@ && $(STRIP) $@ -rsabase_test.exe: $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT) - cp $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT) $@ && $(STRIP) $@ rsaenh_test.exe: $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) cp $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) $@ && $(STRIP) $@ schannel_test.exe: $(DLLDIR)/schannel/tests/schannel_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 8c36d63..299e0e3 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -144,7 +144,6 @@ quartz_test.exe TESTRES "quartz_test.exe" riched20_test.exe TESTRES "riched20_test.exe" riched32_test.exe TESTRES "riched32_test.exe" rpcrt4_test.exe TESTRES "rpcrt4_test.exe" -rsabase_test.exe TESTRES "rsabase_test.exe" rsaenh_test.exe TESTRES "rsaenh_test.exe" schannel_test.exe TESTRES "schannel_test.exe" secur32_test.exe TESTRES "secur32_test.exe"