diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/build-data/cc/bcc.txt | 31 | ||||
-rw-r--r-- | src/build-data/cc/clang.txt | 10 | ||||
-rw-r--r-- | src/build-data/cc/ekopath.txt | 12 | ||||
-rw-r--r-- | src/build-data/cc/gcc.txt | 12 | ||||
-rw-r--r-- | src/build-data/cc/hpcc.txt | 12 | ||||
-rw-r--r-- | src/build-data/cc/icc.txt | 12 | ||||
-rw-r--r-- | src/build-data/cc/msvc.txt | 6 | ||||
-rw-r--r-- | src/build-data/cc/open64.txt | 10 | ||||
-rw-r--r-- | src/build-data/cc/pgi.txt | 10 | ||||
-rw-r--r-- | src/build-data/cc/sunwspro.txt | 12 | ||||
-rw-r--r-- | src/build-data/cc/xlc.txt | 16 | ||||
-rw-r--r-- | src/pubkey/dsa/dsa_op.h | 18 |
12 files changed, 70 insertions, 91 deletions
diff --git a/src/build-data/cc/bcc.txt b/src/build-data/cc/bcc.txt deleted file mode 100644 index 4315c379f..000000000 --- a/src/build-data/cc/bcc.txt +++ /dev/null @@ -1,31 +0,0 @@ -macro_name "BORLAND" - -binary_name "bcc32" - -compile_option "-c " -output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" - -lib_opt_flags "-O2" -check_opt_flags "-O2" -debug_flags "" -no_debug_flags "" -lang_flags "-tWR -tWM -tWC" -warning_flags "-w" - -dll_import_flags "" -dll_export_flags "" - -ar_command "tlib /C /P256" - -makefile_style nmake - -<mach_opt> -i486 -> "/G4" -i586 -> "/G5" -i686 -> "/G6" -athlon -> "/G6" -pentium4 -> "/G6" -</mach_opt> diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt index 18f3580ce..cb86a892f 100644 --- a/src/build-data/cc/clang.txt +++ b/src/build-data/cc/clang.txt @@ -1,14 +1,14 @@ # Largely copied from the gcc config -macro_name "CLANG" +macro_name CLANG binary_name clang compile_option "-c " output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" +add_include_dir_option -I +add_lib_dir_option -L +add_lib_option -l lang_flags "-D_REENTRANT -ansi -Wno-long-long" warning_flags "-W -Wall" @@ -18,7 +18,7 @@ makefile_style unix lib_opt_flags "-O2" check_opt_flags "-O2" shared_flags "-fPIC" -debug_flags "-g" +debug_flags -g no_debug_flags "-finline-functions" <so_link_flags> diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt index ecd813629..bff1ff460 100644 --- a/src/build-data/cc/ekopath.txt +++ b/src/build-data/cc/ekopath.txt @@ -1,12 +1,12 @@ -macro_name "PATHSCALE" +macro_name PATHSCALE -binary_name "pathCC" +binary_name pathCC compile_option "-c " output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" +add_include_dir_option -I +add_lib_dir_option -L +add_lib_option -l lib_opt_flags "-O3 -OPT:Ofast:alias=disjoint" check_opt_flags "-O2" @@ -16,7 +16,7 @@ warning_flags "-W -Wall" ar_command "pathCC -ar -o" shared_flags "-fPIC" -debug_flags "-g" +debug_flags -g dll_import_flags "" dll_export_flags "" diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 0b1668908..be111fafc 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -1,12 +1,12 @@ -macro_name "GCC" +macro_name GCC -binary_name "g++-4.5-20091112" +binary_name g++-4.5-20091112 compile_option "-c " output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" +add_include_dir_option -I +add_lib_dir_option -L +add_lib_option -l lang_flags "-ansi -Wno-long-long -std=c++0x" warning_flags "-W -Wall" @@ -15,7 +15,7 @@ warning_flags "-W -Wall" lib_opt_flags "-O3" check_opt_flags "-O2" shared_flags "-fPIC" -debug_flags "-g" +debug_flags -g no_debug_flags "-finline-functions" dll_import_flags "" diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt index 5bde87de9..614830f9e 100644 --- a/src/build-data/cc/hpcc.txt +++ b/src/build-data/cc/hpcc.txt @@ -1,16 +1,16 @@ -macro_name "HP_ACC" +macro_name HP_ACC -binary_name "aCC" +binary_name aCC compile_option "-c " output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" +add_include_dir_option -I +add_lib_dir_option -L +add_lib_option -l lib_opt_flags "+O2" check_opt_flags "+O2" -debug_flags "-g" +debug_flags -g no_debug_flags "" lang_flags "-AA -ext +eh -z" warning_flags "" # +w diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt index 7187cae56..8a546018e 100644 --- a/src/build-data/cc/icc.txt +++ b/src/build-data/cc/icc.txt @@ -1,16 +1,16 @@ -macro_name "INTEL" +macro_name INTEL -binary_name "icpc" +binary_name icpc compile_option "-c " output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" +add_include_dir_option -I +add_lib_dir_option -L +add_lib_option -l lib_opt_flags "-O2 -ip -unroll" check_opt_flags "-O2" -debug_flags "-g" +debug_flags -g no_debug_flags "-fomit-frame-pointer" lang_flags "" warning_flags "-w1" diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt index 603ea449b..805093ce5 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt @@ -1,11 +1,11 @@ -macro_name "MSVC" +macro_name MSVC -binary_name "cl.exe" +binary_name cl.exe compile_option "/nologo /c " output_to_option "/Fo" add_include_dir_option "/I" -add_lib_dir_option "-L" +add_lib_dir_option -L add_lib_option "" lib_opt_flags "/O2" diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt index e794c755e..275d25f72 100644 --- a/src/build-data/cc/open64.txt +++ b/src/build-data/cc/open64.txt @@ -1,12 +1,12 @@ -macro_name "OPEN64" +macro_name OPEN64 -binary_name "openCC" +binary_name openCC compile_option "-c " output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" +add_include_dir_option -I +add_lib_dir_option -L +add_lib_option -l lib_opt_flags "-O3 -OPT:alias=TYPED" check_opt_flags "-O3 -OPT:alias=TYPED" diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt index a6d2416ab..99f7bcea5 100644 --- a/src/build-data/cc/pgi.txt +++ b/src/build-data/cc/pgi.txt @@ -1,12 +1,12 @@ -macro_name "PORTLAND_GROUP" +macro_name PORTLAND_GROUP -binary_name "pgCC" +binary_name pgCC compile_option "-c " output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" +add_include_dir_option -I +add_lib_dir_option -L +add_lib_option -l lib_opt_flags "-fast -Minline" check_opt_flags "-fast" diff --git a/src/build-data/cc/sunwspro.txt b/src/build-data/cc/sunwspro.txt index 7065d4129..ee41ebeca 100644 --- a/src/build-data/cc/sunwspro.txt +++ b/src/build-data/cc/sunwspro.txt @@ -1,18 +1,18 @@ -macro_name "SUN_WORKSHOP" +macro_name SUN_WORKSHOP -binary_name "CC" +binary_name CC compile_option "-c " output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" +add_include_dir_option -I +add_lib_dir_option -L +add_lib_option -l # The compiler supports up to -xO5, but anything higher than -xO2 causes # incorrect results, infinite loops, other badness. :( lib_opt_flags "-xO2" check_opt_flags "-xO2" -debug_flags "-g" +debug_flags -g no_debug_flags "" shared_flags "-KPIC" warning_flags "+w" diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt index 521624395..e9ae41c1a 100644 --- a/src/build-data/cc/xlc.txt +++ b/src/build-data/cc/xlc.txt @@ -1,17 +1,17 @@ -macro_name "IBM_XLC" +macro_name IBM_XLC -binary_name "xlC" +binary_name xlC compile_option "-c " output_to_option "-o " -add_include_dir_option "-I" -add_lib_dir_option "-L" -add_lib_option "-l" +add_include_dir_option -I +add_lib_dir_option -L +add_lib_option -l lib_opt_flags "-O2" check_opt_flags "-O2" lang_flags "" -debug_flags "-g" +debug_flags -g no_debug_flags "" dll_import_flags "" @@ -27,3 +27,7 @@ power5 -> "-qarch=pwr5" cellppu -> "-qarch=cell" </mach_opt> + +<so_link_flags> +default -> "$(CXX) -qmkshrobj" +</so_link_flags> diff --git a/src/pubkey/dsa/dsa_op.h b/src/pubkey/dsa/dsa_op.h index 0b112c6a1..47a9d09e1 100644 --- a/src/pubkey/dsa/dsa_op.h +++ b/src/pubkey/dsa/dsa_op.h @@ -21,11 +21,14 @@ namespace Botan { class BOTAN_DLL DSA_Operation { public: - virtual bool verify(const byte[], u32bit, - const byte[], u32bit) const = 0; - virtual SecureVector<byte> sign(const byte[], u32bit, - const BigInt&) const = 0; + virtual bool verify(const byte msg[], u32bit msg_len, + const byte sig[], u32bit sig_len) const = 0; + + virtual SecureVector<byte> sign(const byte msg[], u32bit msg_len, + const BigInt& k) const = 0; + virtual DSA_Operation* clone() const = 0; + virtual ~DSA_Operation() {} }; @@ -35,8 +38,11 @@ class BOTAN_DLL DSA_Operation class BOTAN_DLL Default_DSA_Op : public DSA_Operation { public: - bool verify(const byte[], u32bit, const byte[], u32bit) const; - SecureVector<byte> sign(const byte[], u32bit, const BigInt&) const; + bool verify(const byte msg[], u32bit msg_len, + const byte sig[], u32bit sig_len) const; + + SecureVector<byte> sign(const byte msg[], u32bit msg_len, + const BigInt& k) const; DSA_Operation* clone() const { return new Default_DSA_Op(*this); } |