diff options
33 files changed, 265 insertions, 451 deletions
diff --git a/ext/Digest/SHA/Changes b/ext/Digest/SHA/Changes index 68f5e6ab0f..23bc914076 100644 --- a/ext/Digest/SHA/Changes +++ b/ext/Digest/SHA/Changes @@ -1,5 +1,13 @@ Revision history for Perl extension Digest::SHA. +5.34 Thu Feb 2 18:55:40 MST 2006 + - removed Unix-style pathnames in test scripts + -- causing problems on OpenVMS + -- thanks to Steve Peters for patch + - included latest version of Perl Portability header (ppport.h) + - added PERL_CORE check to test scripts + -- allows module to be built into Perl distribution + 5.32 Fri Dec 2 02:32:20 MST 2005 - added POD section to shasum script -- thanks to Gunnar Wolf for patch diff --git a/ext/Digest/SHA/README b/ext/Digest/SHA/README index 1eae56a561..d6faef883a 100644 --- a/ext/Digest/SHA/README +++ b/ext/Digest/SHA/README @@ -1,4 +1,4 @@ -Digest::SHA version 5.32 +Digest::SHA version 5.34 ======================== Digest::SHA is a complete implementation of the NIST Secure Hash @@ -34,7 +34,7 @@ DEPENDENCIES COPYRIGHT AND LICENSE -Copyright (C) 2003-2005 Mark Shelor +Copyright (C) 2003-2006 Mark Shelor This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/ext/Digest/SHA/SHA.pm b/ext/Digest/SHA/SHA.pm index 062562f0a4..31b6af5d35 100644 --- a/ext/Digest/SHA/SHA.pm +++ b/ext/Digest/SHA/SHA.pm @@ -4,7 +4,7 @@ use strict; use warnings; use integer; -our $VERSION = '5.32'; +our $VERSION = '5.34'; require Exporter; our @ISA = qw(Exporter); @@ -541,6 +541,7 @@ The author is particularly grateful to Brian Gladman Andy Lester Alex Muntada + Steve Peters Chris Skiscim Martin Thurn Gunnar Wolf @@ -550,7 +551,7 @@ for their valuable comments and suggestions. =head1 COPYRIGHT AND LICENSE -Copyright (C) 2003-2005 Mark Shelor +Copyright (C) 2003-2006 Mark Shelor This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/ext/Digest/SHA/bin/shasum b/ext/Digest/SHA/bin/shasum index a10262040e..652f25c628 100755 --- a/ext/Digest/SHA/bin/shasum +++ b/ext/Digest/SHA/bin/shasum @@ -2,10 +2,10 @@ # shasum: filter for computing SHA digests (analogous to md5sum) # - # Copyright (C) 2003-2005 Mark Shelor, All Rights Reserved + # Copyright (C) 2003-2006 Mark Shelor, All Rights Reserved # - # Version: 5.32 - # Fri Dec 2 02:32:20 MST 2005 + # Version: 5.34 + # Thu Feb 2 18:55:40 MST 2006 =head1 NAME @@ -38,7 +38,7 @@ mode is to print a line with checksum, a character indicating type =head1 AUTHOR -Copyright (c) 2003-2005 Mark Shelor <mshelor@cpan.org>. +Copyright (c) 2003-2006 Mark Shelor <mshelor@cpan.org>. =head1 SEE ALSO @@ -50,7 +50,7 @@ L<Digest::SHA::PurePerl>. use strict; use Getopt::Long; -my $VERSION = "5.32"; +my $VERSION = "5.34"; # Try to use Digest::SHA, since it's faster. If not installed, diff --git a/ext/Digest/SHA/ppport.h b/ext/Digest/SHA/ppport.h index fe9235f5ee..27b4be25f9 100644 --- a/ext/Digest/SHA/ppport.h +++ b/ext/Digest/SHA/ppport.h @@ -4,10 +4,10 @@ /* ---------------------------------------------------------------------- - ppport.h -- Perl/Pollution/Portability Version 3.07 + ppport.h -- Perl/Pollution/Portability Version 3.06_01 Automatically created by Devel::PPPort running under - perl 5.008006 on Wed Jan 18 07:00:54 2006. + perl 5.008008 on Thu Feb 2 18:31:22 2006. Do NOT edit this file directly! -- Edit PPPort_pm.PL and the includes in parts/inc/ instead. @@ -22,7 +22,7 @@ SKIP =head1 NAME -ppport.h - Perl/Pollution/Portability version 3.07 +ppport.h - Perl/Pollution/Portability version 3.06_01 =head1 SYNOPSIS @@ -45,9 +45,6 @@ ppport.h - Perl/Pollution/Portability version 3.07 --nochanges don't suggest changes --nofilter don't filter input files - --strip strip all script and doc functionality from - ppport.h (this, obviously, cannot be undone) - --list-provided list provided API --list-unsupported list unsupported API --api-info=name show Perl API portability information @@ -91,7 +88,7 @@ Tell F<ppport.h> to check for compatibility with the given Perl version. The default is to check for compatibility with Perl version 5.003. You can use this option to reduce the output of F<ppport.h> if you intend to be backward compatible only -down to a certain Perl version. +up to a certain Perl version. =head2 --cplusplus @@ -124,13 +121,6 @@ unless these are also deactivated. Don't filter the list of input files. By default, files not looking like source code (i.e. not *.xs, *.c, *.cc, *.cpp or *.h) are skipped. -=head2 --strip - -Strip all script and documentation functionality from F<ppport.h>. -This reduces the size of F<ppport.h> dramatically and may be useful -if you want to include F<ppport.h> in smaller modules without -increasing their distribution size too much. - =head2 --list-provided Lists the API elements for which compatibility is provided by @@ -176,36 +166,30 @@ will provide wrappers for older Perl versions. =item * -If you use one of a few functions or variables that were not present in -earlier versions of Perl, and that can't be provided using a macro, you -have to explicitly request support for these functions by adding one or +If you use one of a few functions that were not present in earlier +versions of Perl, and that can't be provided using a macro, you have +to explicitly request support for these functions by adding one or more C<#define>s in your source code before the inclusion of F<ppport.h>. -These functions or variables will be marked C<explicit> in the list shown -by C<--list-provided>. +These functions will be marked C<explicit> in the list shown by +C<--list-provided>. Depending on whether you module has a single or multiple files that -use such functions or variables, you want either C<static> or global -variants. +use such functions, you want either C<static> or global variants. -For a C<static> function or variable (used only in a single source -file), use: +For a C<static> function, use: #define NEED_function - #define NEED_variable -For a global function or variable (used in multiple source files), -use: +For a global function, use: #define NEED_function_GLOBAL - #define NEED_variable_GLOBAL -Note that you mustn't have more than one global request for the -same function or variable in your project. +Note that you mustn't have more than one global request for one +function in your project. - Function / Variable Static Request Global Request + Function Static Request Global Request ----------------------------------------------------------------------------------------- - PL_signals NEED_PL_signals NEED_PL_signals_GLOBAL eval_pv() NEED_eval_pv NEED_eval_pv_GLOBAL grok_bin() NEED_grok_bin NEED_grok_bin_GLOBAL grok_hex() NEED_grok_hex NEED_grok_hex_GLOBAL @@ -223,8 +207,8 @@ same function or variable in your project. vnewSVpvf() NEED_vnewSVpvf NEED_vnewSVpvf_GLOBAL To avoid namespace conflicts, you can change the namespace of the -explicitly exported functions / variables using the C<DPPP_NAMESPACE> -macro. Just C<#define> the macro before including C<ppport.h>: +explicitly exported functions using the C<DPPP_NAMESPACE> macro. +Just C<#define> the macro before including C<ppport.h>: #define DPPP_NAMESPACE MyOwnNamespace_ #include "ppport.h" @@ -327,7 +311,7 @@ module from CPAN. =head1 COPYRIGHT -Version 3.x, Copyright (c) 2004-2006, Marcus Holland-Moritz. +Version 3.x, Copyright (c) 2004-2005, Marcus Holland-Moritz. Version 2.x, Copyright (C) 2001, Paul Marquess. @@ -351,7 +335,6 @@ my %opt = ( changes => 1, cplusplus => 0, filter => 1, - strip => 0, ); my($ppport) = $0 =~ /([\w.]+)$/; @@ -361,7 +344,7 @@ my $HS = "[ \t]"; # horizontal whitespace eval { require Getopt::Long; Getopt::Long::GetOptions(\%opt, qw( - help quiet diag! filter! hints! changes! cplusplus strip + help quiet diag! filter! hints! changes! cplusplus patch=s copy=s diff=s compat-version=s list-provided list-unsupported api-info=s )) or usage(); @@ -373,7 +356,6 @@ if ($@ and grep /^-/, @ARGV) { } usage() if $opt{help}; -strip() if $opt{strip}; if (exists $opt{'compat-version'}) { my($r,$v,$s) = eval { parse_version($opt{'compat-version'}) }; @@ -430,7 +412,6 @@ ENTER||| ERRSV|5.004050||p EXTEND||| EXTERN_C|5.005000||p -F0convert|||n FREETMPS||| GIMME_V||5.004000|n GIMME|||n @@ -471,7 +452,6 @@ IVdf|5.006000||p LEAVE||| LVRET||| MARK||| -MULTICALL||5.009003| MY_CXT_CLONE|5.009002||p MY_CXT_INIT|5.007003||p MY_CXT|5.007003||p @@ -484,9 +464,9 @@ NVTYPE|5.006000||p NVef|5.006001||p NVff|5.006001||p NVgf|5.006001||p -Newxc|5.009003||p -Newxz|5.009003||p -Newx|5.009003||p +Newc||| +Newz||| +New||| Nullav||| Nullch||| Nullcv||| @@ -563,7 +543,6 @@ PERL_SCAN_GREATER_THAN_UV_MAX|5.007003||p PERL_SCAN_SILENT_ILLDIGIT|5.008001||p PERL_SHORT_MAX|5.004000||p PERL_SHORT_MIN|5.004000||p -PERL_SIGNALS_UNSAFE_FLAG|5.008001||p PERL_SUBVERSION|5.006000||p PERL_UCHAR_MAX|5.004000||p PERL_UCHAR_MIN|5.004000||p @@ -604,7 +583,6 @@ PL_ppaddr|5.006000||p PL_rsfp_filters|5.004050||p PL_rsfp|5.004050||p PL_rs|||n -PL_signals|5.008001||p PL_stack_base|5.004050||p PL_stack_sp|5.004050||p PL_stdingv|5.004050||p @@ -614,7 +592,6 @@ PL_sv_undef|5.004050||pn PL_sv_yes|5.004050||pn PL_tainted|5.004050||p PL_tainting|5.004050||p -POP_MULTICALL||5.009003| POPi|||n POPl|||n POPn|||n @@ -628,7 +605,6 @@ PTR2UV|5.006000||p PTR2ul|5.007001||p PTRV|5.006000||p PUSHMARK||| -PUSH_MULTICALL||5.009003| PUSHi||| PUSHmortal|5.009002||p PUSHn||| @@ -708,7 +684,7 @@ SvIsCOW||5.008003| SvLEN_set||| SvLEN||| SvLOCK||5.007003| -SvMAGIC_set|5.009003||p +SvMAGIC_set||5.009003| SvNIOK_off||| SvNIOKp||| SvNIOK||| @@ -729,8 +705,6 @@ SvPOK_only||| SvPOK_on||| SvPOKp||| SvPOK||| -SvPVX_const|5.009003||p -SvPVX_mutable|5.009003||p SvPVX||| SvPV_force_nomg|5.007002||p SvPV_force||| @@ -755,11 +729,11 @@ SvREFCNT||| SvROK_off||| SvROK_on||| SvROK||| -SvRV_set|5.009003||p +SvRV_set||5.009003| SvRV||| SvSETMAGIC||| SvSHARE||5.007003| -SvSTASH_set|5.009003|5.009003|p +SvSTASH_set||5.009003| SvSTASH||| SvSetMagicSV_nosteal||5.004000| SvSetMagicSV||5.004000| @@ -780,7 +754,7 @@ SvUTF8||5.006000| SvUVXx|5.004000||p SvUVX|5.004000||p SvUV_nomg|5.009001||p -SvUV_set|5.009003||p +SvUV_set||5.009003| SvUVx|5.004000||p SvUV|5.004000||p SvVOK||5.008001| @@ -810,7 +784,7 @@ XSRETURN_PV||| XSRETURN_UNDEF||| XSRETURN_UV|5.008001||p XSRETURN_YES||| -XSRETURN|||p +XSRETURN||| XST_mIV||| XST_mNO||| XST_mNV||| @@ -820,7 +794,6 @@ XST_mUV|5.008001||p XST_mYES||| XS_VERSION_BOOTCHECK||| XS_VERSION||| -XSprePUSH|5.006000||p XS||| ZeroD|5.009002||p Zero||| @@ -833,10 +806,6 @@ aTHX|5.006000||p add_data||| allocmy||| amagic_call||| -amagic_cmp_locale||| -amagic_cmp||| -amagic_i_ncmp||| -amagic_ncmp||| any_dup||| ao||| append_elem||| @@ -845,6 +814,8 @@ apply_attrs_my||| apply_attrs_string||5.006001| apply_attrs||| apply||| +asIV||| +asUV||| atfork_lock||5.007003|n atfork_unlock||5.007003|n av_arylen_p||5.009003| @@ -891,7 +862,6 @@ cast_i32||5.006000| cast_iv||5.006000| cast_ulong||5.006000| cast_uv||5.006000| -check_type_and_open||| check_uni||| checkcomma||| checkposixcc||| @@ -926,7 +896,6 @@ ck_return||| ck_rfun||| ck_rvconst||| ck_sassign||| -ck_say||| ck_select||| ck_shift||| ck_sort||| @@ -937,8 +906,6 @@ ck_substr||| ck_svconst||| ck_trunc||| ck_unpack||| -ckwarn_d||5.009003| -ckwarn||5.009003| cl_and||| cl_anything||| cl_init_zero||| @@ -951,7 +918,7 @@ cop_free||| cr_textfilter||| croak_nocontext|||vn croak|||v -csighandler||5.009003|n +csighandler||5.007001|n custom_op_desc||5.007003| custom_op_name||5.007003| cv_ckproto||| @@ -962,11 +929,10 @@ cv_undef||| cx_dump||5.005000| cx_dup||| cxinc||| -dAXMARK|5.009003||p +dAXMARK||5.009003| dAX|5.007002||p dITEMS|5.007002||p dMARK||| -dMULTICALL||5.009003| dMY_CXT_SV|5.007003||p dMY_CXT|5.007003||p dNOOP|5.006000||p @@ -991,12 +957,13 @@ debprof||| debstackptrs||5.007003| debstack||5.007003| deb||5.007003|v +del_he||| del_sv||| delimcpy||5.004000| +depcom||| deprecate_old||| deprecate||| despatch_signals||5.007001| -destroy_matcher||| die_nocontext|||vn die_where||| die|||v @@ -1037,7 +1004,6 @@ do_readline||| do_seek||| do_semop||| do_shmio||| -do_smartmatch||| do_spawn_nowait||| do_spawn||| do_sprintf||| @@ -1065,13 +1031,10 @@ dooneliner||| doopen_pm||| doparseform||| dopoptoeval||| -dopoptogiven||| dopoptolabel||| dopoptoloop||| dopoptosub_at||| dopoptosub||| -dopoptowhen||| -doref||5.009003| dounwind||| dowantarray||| dump_all||5.006000| @@ -1082,7 +1045,6 @@ dump_indent||5.006000|v dump_mstats||| dump_packsubs||5.006000| dump_sub||5.006000| -dump_sv_child||| dump_vindent||5.006000| dumpuntil||| dup_attrlist||| @@ -1093,7 +1055,6 @@ expect_number||| fbm_compile||5.005000| fbm_instr||5.005000| fd_on_nosuid_fs||| -feature_is_enabled||| filter_add||| filter_del||| filter_gets||| @@ -1105,7 +1066,6 @@ find_runcv||| find_rundefsvoffset||5.009002| find_script||| find_uninit_var||| -first_symbol|||n fold_constants||| forbid_setid||| force_ident||| @@ -1151,10 +1111,8 @@ group_end||| gv_AVadd||| gv_HVadd||| gv_IOadd||| -gv_SVadd||| gv_autoload4||5.004000| gv_check||| -gv_const_sv||5.009003| gv_dump||5.006000| gv_efullname3||5.004000| gv_efullname4||5.006001| @@ -1174,6 +1132,7 @@ gv_fullname||| gv_handler||5.007001| gv_init_sv||| gv_init||| +gv_share||| gv_stashpvn|5.006000||p gv_stashpv||| gv_stashsv||| @@ -1183,7 +1142,6 @@ hfreeentries||| hsplit||| hv_assert||5.009001| hv_auxinit||| -hv_backreferences_p||| hv_clear_placeholders||5.009001| hv_clear||| hv_delayfree_ent||5.004000| @@ -1205,7 +1163,6 @@ hv_iternext_flags||5.008000| hv_iternextsv||| hv_iternext||| hv_iterval||| -hv_kill_backrefs||| hv_ksplit||5.004000| hv_magic_check||| hv_magic||| @@ -1226,7 +1183,6 @@ ibcmp_utf8||5.007003| ibcmp||| incl_perldb||| incline||| -incpush_if_exists||| incpush||| ingroup||| init_argv_symbols||| @@ -1296,7 +1252,6 @@ is_utf8_ascii||5.006000| is_utf8_char_slow||| is_utf8_char||5.006000| is_utf8_cntrl||5.006000| -is_utf8_common||| is_utf8_digit||5.006000| is_utf8_graph||5.006000| is_utf8_idcont||5.008000| @@ -1325,7 +1280,6 @@ list||| load_module_nocontext|||vn load_module||5.006000|v localize||| -looks_like_bool||| looks_like_number||| lop||| mPUSHi|5.009002||p @@ -1392,12 +1346,10 @@ magic_set||| magic_sizepack||| magic_wipepack||| magicname||| -make_matcher||| make_trie||| malloced_size|||n malloc||5.007002|n markstack_grow||| -matcher_matches_sv||| measure_struct||| memEQ|5.004000||p memNE|5.004000||p @@ -1438,8 +1390,6 @@ my_betohl|||n my_betohs|||n my_bzero|||n my_chsize||| -my_clearenv||| -my_cxt_init||| my_exit_jump||| my_exit||| my_failure_exit||5.004000| @@ -1474,14 +1424,12 @@ my_popen_list||5.007001| my_popen||5.004000| my_setenv||| my_socketpair||5.007003|n -my_sprintf||5.009003|vn my_stat||| my_strftime||5.007002| my_swabn|||n my_swap||| my_unexec||| my||| -need_utf8|||n newANONATTRSUB||5.006000| newANONHASH||| newANONLIST||| @@ -1497,8 +1445,6 @@ newCVREF||| newDEFSVOP||| newFORM||| newFOROP||| -newGIVENOP||5.009003| -newGIVWHENOP||| newGVOP||| newGVREF||| newGVgen||| @@ -1539,7 +1485,6 @@ newSVsv||| newSVuv|5.006000||p newSV||| newUNOP||| -newWHENOP||5.009003| newWHILEOP||5.009003| newXSproto||5.006000| newXS||5.006000| @@ -1562,7 +1507,6 @@ not_a_number||| nothreadhook||5.008000| nuke_stacks||| num_overflow|||n -offer_nice_chunk||| oopsAV||| oopsCV||| oopsHV||| @@ -1646,16 +1590,16 @@ reentrant_free||| reentrant_init||| reentrant_retry|||vn reentrant_size||| -ref_array_or_hash||| refkids||| refto||| -ref||5.009003| +ref||| reg_node||| reganode||| regatom||| regbranch||| regclass_swash||5.007003| regclass||| +regcp_set_to||| regcppop||| regcppush||| regcurly||| @@ -1686,14 +1630,12 @@ report_evil_fh||| report_uninit||| require_errno||| require_pv||5.006000| -restore_magic||| rninstr||| rsignal_restore||| rsignal_save||| rsignal_state||5.004000| rsignal||5.004000| run_body||| -run_user_filter||| runops_debug||5.005000| runops_standard||5.005000| rvpv_dup||| @@ -1781,9 +1723,7 @@ scan_vstring||5.008001| scan_word||| scope||| screaminstr||5.005000| -seed||5.008001| -sequence_num||| -sequence||| +seed||| set_context||5.006000|n set_csh||| set_numeric_local||5.006000| @@ -1792,15 +1732,11 @@ set_numeric_standard||5.006000| setdefout||| setenv_getix||| share_hek_flags||| -share_hek||5.004000| +share_hek||| si_dup||| sighandler|||n simplify_sort||| skipspace||| -sortcv_stacked||| -sortcv_xsub||| -sortcv||| -sortsv_flags||5.009003| sortsv||5.007003| ss_dup||| stack_grow||| @@ -1815,8 +1751,6 @@ strLE||| strLT||| strNE||| str_to_version||5.006000| -stringify_regexp||| -strip_return||| strnEQ||| strnNE||| study_chunk||| @@ -1852,12 +1786,12 @@ sv_catpvf_mg|5.006000|5.004000|pv sv_catpvf_nocontext|||vn sv_catpvf||5.004000|v sv_catpvn_flags||5.007002| -sv_catpvn_mg|5.004050||p +sv_catpvn_mg|5.006000||p sv_catpvn_nomg|5.007002||p sv_catpvn||| sv_catpv||| sv_catsv_flags||5.007002| -sv_catsv_mg|5.004050||p +sv_catsv_mg|5.006000||p sv_catsv_nomg|5.007002||p sv_catsv||| sv_chop||| @@ -1875,7 +1809,6 @@ sv_derived_from||5.004000| sv_dump||| sv_dup||| sv_eq||| -sv_exp_grow||| sv_force_normal_flags||5.007001| sv_force_normal||5.006000| sv_free2||| @@ -1883,19 +1816,16 @@ sv_free_arenas||| sv_free||| sv_gets||5.004000| sv_grow||| -sv_i_ncmp||| sv_inc||| sv_insert||| sv_isa||| sv_isobject||| sv_iv||5.005000| -sv_kill_backrefs||| sv_len_utf8||5.006000| sv_len||| sv_magicext||5.007003| sv_magic||| sv_mortalcopy||| -sv_ncmp||| sv_newmortal||| sv_newref||| sv_nolocking||5.007003| @@ -1977,7 +1907,6 @@ sv_vsetpvf|5.006000|5.004000|p svtype||| swallow_bom||| swash_fetch||5.007002| -swash_get||| swash_init||5.006000| sys_intern_clear||| sys_intern_dup||| @@ -2001,12 +1930,10 @@ to_utf8_lower||5.007003| to_utf8_substr||| to_utf8_title||5.007003| to_utf8_upper||5.007003| -tokenize_use||| tokeq||| tokereport||| too_few_arguments||| too_many_arguments||| -uiv_2buf|||n unlnk||| unpack_rec||| unpack_str||5.007003| @@ -2014,11 +1941,12 @@ unpackstring||5.008001| unshare_hek_or_pvn||| unshare_hek||| unsharepvn||5.004000| -unwind_handler_stack||| upg_version||5.009000| usage||| +utf16_textfilter||| utf16_to_utf8_reversed||5.006001| utf16_to_utf8||5.006001| +utf16rev_textfilter||| utf8_distance||5.006000| utf8_hop||5.006000| utf8_length||5.007001| @@ -2027,11 +1955,11 @@ utf8_mg_pos||| utf8_to_bytes||5.006001| utf8_to_uvchr||5.007001| utf8_to_uvuni||5.007001| -utf8n_to_uvchr||| +utf8n_to_uvchr||5.007001| utf8n_to_uvuni||5.007001| utilize||| uvchr_to_utf8_flags||5.007003| -uvchr_to_utf8||| +uvchr_to_utf8||5.007001| uvuni_to_utf8_flags||5.007003| uvuni_to_utf8||5.007001| validate_suid||| @@ -2039,8 +1967,6 @@ varname||| vcmp||5.009000| vcroak||5.006000| vdeb||5.007003| -vdie_common||| -vdie_croak_common||| vdie||| vform||5.006000| visit||| @@ -2052,7 +1978,6 @@ vnewSVpvf|5.006000|5.004000|p vnormal||5.009002| vnumify||5.009000| vstringify||5.009000| -vverify||5.009003| vwarner||5.006000| vwarn||5.006000| wait4pid||| @@ -2062,7 +1987,6 @@ warner||5.006000|v warn|||v watch||| whichsig||| -write_no_mem||| write_to_stderr||| yyerror||| yylex||| @@ -2697,35 +2621,6 @@ ENDUSAGE exit 2; } -sub strip -{ - my $self = do { local(@ARGV,$/)=($0); <> }; - $self =~ s/^$HS+Do NOT edit.*?(?=^-)//ms; - $self =~ s/^SKIP.*(?=^__DATA__)/SKIP -if (\@ARGV && \$ARGV[0] eq '--unstrip') { - eval { require Devel::PPPort }; - \$@ and die "Cannot require Devel::PPPort, please install.\\n"; - Devel::PPPort::WriteFile(\$0); - exit 0; -} -print <<END; - -Sorry, but this is a stripped version of \$0. - -To be able to use its original script and doc functionality, -please try to regenerate this file using: - - \$^X \$0 --unstrip - -END -/ms; - - open OUT, ">$0" or die "cannot strip $0: $!\n"; - print OUT $self; - - exit 0; -} - __DATA__ */ @@ -3103,18 +2998,20 @@ __DATA__ #ifndef UVSIZE # define UVSIZE IVSIZE #endif + #ifndef sv_setuv -# define sv_setuv(sv, uv) \ - STMT_START { \ - UV TeMpUv = uv; \ - if (TeMpUv <= IV_MAX) \ - sv_setiv(sv, TeMpUv); \ - else \ - sv_setnv(sv, (double)TeMpUv); \ - } STMT_END +# define sv_setuv(sv, uv) \ + STMT_START { \ + UV TeMpUv = uv; \ + if (TeMpUv <= IV_MAX) \ + sv_setiv(sv, TeMpUv); \ + else \ + sv_setnv(sv, (double)TeMpUv); \ + } STMT_END #endif + #ifndef newSVuv -# define newSVuv(uv) ((uv) <= IV_MAX ? newSViv((IV)uv) : newSVnv((NV)uv)) +# define newSVuv(uv) ((uv) <= IV_MAX ? newSViv((IV)uv) : newSVnv((NV)uv)) #endif #ifndef sv_2uv # define sv_2uv(sv) ((PL_Sv = (sv)), (UV) (SvNOK(PL_Sv) ? SvNV(PL_Sv) : sv_2nv(PL_Sv))) @@ -3157,60 +3054,7 @@ __DATA__ # define XPUSHu(u) STMT_START { sv_setuv(TARG, (UV)(u)); XPUSHTARG; } STMT_END #endif -#ifdef HAS_MEMCMP -#ifndef memNE -# define memNE(s1,s2,l) (memcmp(s1,s2,l)) -#endif - -#ifndef memEQ -# define memEQ(s1,s2,l) (!memcmp(s1,s2,l)) -#endif - -#else -#ifndef memNE -# define memNE(s1,s2,l) (bcmp(s1,s2,l)) -#endif - -#ifndef memEQ -# define memEQ(s1,s2,l) (!bcmp(s1,s2,l)) -#endif - -#endif -#ifndef MoveD -# define MoveD(s,d,n,t) memmove((char*)(d),(char*)(s), (n) * sizeof(t)) -#endif - -#ifndef CopyD -# define CopyD(s,d,n,t) memcpy((char*)(d),(char*)(s), (n) * sizeof(t)) -#endif - -#ifdef HAS_MEMSET -#ifndef ZeroD -# define ZeroD(d,n,t) memzero((char*)(d), (n) * sizeof(t)) -#endif - -#else -#ifndef ZeroD -# define ZeroD(d,n,t) ((void)memzero((char*)(d), (n) * sizeof(t)), d) -#endif - -#endif -#ifndef Poison -# define Poison(d,n,t) (void)memset((char*)(d), 0xAB, (n) * sizeof(t)) -#endif -#ifndef Newx -# define Newx(v,n,t) New(0,v,n,t) -#endif - -#ifndef Newxc -# define Newxc(v,n,t,c) Newc(0,v,n,t,c) -#endif - -#ifndef Newxz -# define Newxz(v,n,t) Newz(0,v,n,t) -#endif - -#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION <= 5))) +#if (PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION <= 5)) /* Replace: 1 */ # define PL_DBsingle DBsingle # define PL_DBsub DBsub @@ -3388,53 +3232,64 @@ typedef NVTYPE NV; #endif /* Replace: 0 */ -#ifndef dUNDERBAR -# define dUNDERBAR dNOOP + +#ifdef HAS_MEMCMP +#ifndef memNE +# define memNE(s1,s2,l) (memcmp(s1,s2,l)) #endif -#ifndef UNDERBAR -# define UNDERBAR DEFSV +#ifndef memEQ +# define memEQ(s1,s2,l) (!memcmp(s1,s2,l)) #endif -#ifndef dAX -# define dAX I32 ax = MARK - PL_stack_base + 1 + +#else +#ifndef memNE +# define memNE(s1,s2,l) (bcmp(s1,s2,l)) #endif -#ifndef dITEMS -# define dITEMS I32 items = SP - MARK +#ifndef memEQ +# define memEQ(s1,s2,l) (!bcmp(s1,s2,l)) #endif -#ifndef dXSTARG -# define dXSTARG SV * targ = sv_newmortal() + #endif -#ifndef dAXMARK -# define dAXMARK I32 ax = POPMARK; \ - register SV ** const mark = PL_stack_base + ax++ +#ifndef MoveD +# define MoveD(s,d,n,t) memmove((char*)(d),(char*)(s), (n) * sizeof(t)) #endif -#ifndef XSprePUSH -# define XSprePUSH (sp = PL_stack_base + ax - 1) + +#ifndef CopyD +# define CopyD(s,d,n,t) memcpy((char*)(d),(char*)(s), (n) * sizeof(t)) #endif -#if ((PERL_VERSION < 5) || ((PERL_VERSION == 5) && (PERL_SUBVERSION < 0))) -# undef XSRETURN -# define XSRETURN(off) \ - STMT_START { \ - PL_stack_sp = PL_stack_base + ax + ((off) - 1); \ - return; \ - } STMT_END +#ifdef HAS_MEMSET +#ifndef ZeroD +# define ZeroD(d,n,t) memzero((char*)(d), (n) * sizeof(t)) #endif -#ifndef PERL_SIGNALS_UNSAFE_FLAG +#else +#ifndef ZeroD +# define ZeroD(d,n,t) ((void)memzero((char*)(d), (n) * sizeof(t)),d) +#endif -#define PERL_SIGNALS_UNSAFE_FLAG 0x0001 +#endif +#ifndef Poison +# define Poison(d,n,t) (void)memset((char*)(d), 0xAB, (n) * sizeof(t)) +#endif +#ifndef dUNDERBAR +# define dUNDERBAR dNOOP +#endif -#if defined(NEED_PL_signals) -static U32 DPPP_(my_PL_signals) = PERL_SIGNALS_UNSAFE_FLAG; -#elif defined(NEED_PL_signals_GLOBAL) -U32 DPPP_(my_PL_signals) = PERL_SIGNALS_UNSAFE_FLAG; -#else -extern U32 DPPP_(my_PL_signals); +#ifndef UNDERBAR +# define UNDERBAR DEFSV +#endif +#ifndef dAX +# define dAX I32 ax = MARK - PL_stack_base + 1 #endif -#define PL_signals DPPP_(my_PL_signals) +#ifndef dITEMS +# define dITEMS I32 items = SP - MARK +#endif +#ifndef dXSTARG +# define dXSTARG SV * targ = sv_newmortal() #endif #ifndef dTHR # define dTHR dNOOP @@ -3682,7 +3537,7 @@ DPPP_(my_newCONSTSUB)(HV *stash, char *name, SV *sv) * case below uses it to declare the data as static. */ #define START_MY_CXT -#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION < 68))) +#if (PERL_VERSION < 4 || (PERL_VERSION == 4 && PERL_SUBVERSION < 68 )) /* Fetches the SV that keeps the per-interpreter data. */ #define dMY_CXT_SV \ SV *my_cxt_sv = get_sv(MY_CXT_KEY, FALSE) @@ -3896,62 +3751,6 @@ DPPP_(my_sv_2pvbyte)(pTHX_ register SV *sv, STRLEN *lp) #ifndef sv_pvn_force # define sv_pvn_force(sv, len) SvPV_force(sv, len) #endif -#ifndef SvMAGIC_set -# define SvMAGIC_set(sv, val) \ - STMT_START { assert(SvTYPE(sv) >= SVt_PVMG); \ - (((XPVMG*) SvANY(sv))->xmg_magic = (val)); } STMT_END -#endif - -#if ((PERL_VERSION < 9) || ((PERL_VERSION == 9) && (PERL_SUBVERSION < 3))) -#ifndef SvPVX_const -# define SvPVX_const(sv) ((const char*) (0 + SvPVX(sv))) -#endif - -#ifndef SvPVX_mutable -# define SvPVX_mutable(sv) (0 + SvPVX(sv)) -#endif -#ifndef SvRV_set -# define SvRV_set(sv, val) \ - STMT_START { assert(SvTYPE(sv) >= SVt_RV); \ - (((XRV*) SvANY(sv))->xrv_rv = (val)); } STMT_END -#endif - -#else -#ifndef SvPVX_const -# define SvPVX_const(sv) ((const char*)((sv)->sv_u.svu_pv)) -#endif - -#ifndef SvPVX_mutable -# define SvPVX_mutable(sv) ((sv)->sv_u.svu_pv) -#endif -#ifndef SvRV_set -# define SvRV_set(sv, val) \ - STMT_START { assert(SvTYPE(sv) >= SVt_RV); \ - ((sv)->sv_u.svu_rv = (val)); } STMT_END -#endif - -#endif -#ifndef SvSTASH_set -# define SvSTASH_set(sv, val) \ - STMT_START { assert(SvTYPE(sv) >= SVt_PVMG); \ - (((XPVMG*) SvANY(sv))->xmg_stash = (val)); } STMT_END -#endif - -#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION < 0))) -#ifndef SvUV_set -# define SvUV_set(sv, val) \ - STMT_START { assert(SvTYPE(sv) == SVt_IV || SvTYPE(sv) >= SVt_PVIV); \ - (((XPVIV*) SvANY(sv))->xiv_iv = (IV) (val)); } STMT_END -#endif - -#else -#ifndef SvUV_set -# define SvUV_set(sv, val) \ - STMT_START { assert(SvTYPE(sv) == SVt_IV || SvTYPE(sv) >= SVt_PVIV); \ - (((XPVUV*) SvANY(sv))->xuv_uv = (val)); } STMT_END -#endif - -#endif #if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(vnewSVpvf) #if defined(NEED_vnewSVpvf) @@ -4608,7 +4407,7 @@ DPPP_(my_grok_numeric_radix)(pTHX_ const char **sp, const char *send) return TRUE; } } -#endif +#endif /* PERL_VERSION */ #endif /* USE_LOCALE_NUMERIC */ /* always try "." if numeric radix didn't match because * we may have data from different locales mixed */ diff --git a/ext/Digest/SHA/src/hmac.c b/ext/Digest/SHA/src/hmac.c index 19d999bf20..60e1ba013b 100644 --- a/ext/Digest/SHA/src/hmac.c +++ b/ext/Digest/SHA/src/hmac.c @@ -3,10 +3,10 @@ * * Ref: FIPS PUB 198 The Keyed-Hash Message Authentication Code * - * Copyright (C) 2003-2005 Mark Shelor, All Rights Reserved + * Copyright (C) 2003-2006 Mark Shelor, All Rights Reserved * - * Version: 5.32 - * Fri Dec 2 02:32:20 MST 2005 + * Version: 5.34 + * Thu Feb 2 18:55:40 MST 2006 * */ diff --git a/ext/Digest/SHA/src/hmac.h b/ext/Digest/SHA/src/hmac.h index 639c46f5b3..903794de6b 100644 --- a/ext/Digest/SHA/src/hmac.h +++ b/ext/Digest/SHA/src/hmac.h @@ -3,10 +3,10 @@ * * Ref: FIPS PUB 198 The Keyed-Hash Message Authentication Code * - * Copyright (C) 2003-2005 Mark Shelor, All Rights Reserved + * Copyright (C) 2003-2006 Mark Shelor, All Rights Reserved * - * Version: 5.32 - * Fri Dec 2 02:32:20 MST 2005 + * Version: 5.34 + * Thu Feb 2 18:55:40 MST 2006 * */ diff --git a/ext/Digest/SHA/src/sha.c b/ext/Digest/SHA/src/sha.c index 9fb7775bd4..6e024c4e38 100644 --- a/ext/Digest/SHA/src/sha.c +++ b/ext/Digest/SHA/src/sha.c @@ -3,10 +3,10 @@ * * Ref: NIST FIPS PUB 180-2 Secure Hash Standard * - * Copyright (C) 2003-2005 Mark Shelor, All Rights Reserved + * Copyright (C) 2003-2006 Mark Shelor, All Rights Reserved * - * Version: 5.32 - * Fri Dec 2 02:32:20 MST 2005 + * Version: 5.34 + * Thu Feb 2 18:55:40 MST 2006 * */ diff --git a/ext/Digest/SHA/src/sha.h b/ext/Digest/SHA/src/sha.h index 0cbc9c3752..aff4ad31f2 100644 --- a/ext/Digest/SHA/src/sha.h +++ b/ext/Digest/SHA/src/sha.h @@ -3,10 +3,10 @@ * * Ref: NIST FIPS PUB 180-2 Secure Hash Standard * - * Copyright (C) 2003-2005 Mark Shelor, All Rights Reserved + * Copyright (C) 2003-2006 Mark Shelor, All Rights Reserved * - * Version: 5.32 - * Fri Dec 2 02:32:20 MST 2005 + * Version: 5.34 + * Thu Feb 2 18:55:40 MST 2006 * */ diff --git a/ext/Digest/SHA/t/0-pod-coverage.t b/ext/Digest/SHA/t/0-pod-coverage.t index 6059400c0e..de0264801f 100644 --- a/ext/Digest/SHA/t/0-pod-coverage.t +++ b/ext/Digest/SHA/t/0-pod-coverage.t @@ -1,8 +1,11 @@ BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } +} + +BEGIN { eval "use Test::More"; if ($@) { print "1..0 # Skipped: Test::More not installed\n"; @@ -14,15 +17,15 @@ eval "use Test::Pod::Coverage 0.08"; plan skip_all => "Test::Pod::Coverage 0.08 required for testing POD coverage" if $@; my @privfcns = qw( - Addfile - Hexdigest - B64digest + Addfile + Hexdigest + B64digest shaclose - shadump - shadup - shaload - shaopen - sharewind + shadump + shadup + shaload + shaopen + sharewind shawrite ); diff --git a/ext/Digest/SHA/t/0-pod.t b/ext/Digest/SHA/t/0-pod.t index cb640fa02b..e4065136bc 100644 --- a/ext/Digest/SHA/t/0-pod.t +++ b/ext/Digest/SHA/t/0-pod.t @@ -1,9 +1,11 @@ BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } +} +BEGIN { eval "use Test::More"; if ($@) { print "1..0 # Skipped: Test::More not installed\n"; diff --git a/ext/Digest/SHA/t/1-exist.t b/ext/Digest/SHA/t/1-exist.t index 82c9d2027d..feaa355e1d 100644 --- a/ext/Digest/SHA/t/1-exist.t +++ b/ext/Digest/SHA/t/1-exist.t @@ -1,10 +1,10 @@ use Test; BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } BEGIN { plan tests => 1 } diff --git a/ext/Digest/SHA/t/1-hello-world.t b/ext/Digest/SHA/t/1-hello-world.t index 4bf2392789..46aeaf09ae 100644 --- a/ext/Digest/SHA/t/1-hello-world.t +++ b/ext/Digest/SHA/t/1-hello-world.t @@ -2,16 +2,17 @@ use Test; use Digest::SHA qw(sha1); use strict; use integer; + BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@vec, @rsp); -BEGIN { +BEGIN { @vec = ( "hello world" ); diff --git a/ext/Digest/SHA/t/2-nist-sha-1.t b/ext/Digest/SHA/t/2-nist-sha-1.t index a91080e6bf..5a5c3c19ab 100644 --- a/ext/Digest/SHA/t/2-nist-sha-1.t +++ b/ext/Digest/SHA/t/2-nist-sha-1.t @@ -4,10 +4,10 @@ use integer; use Digest::SHA qw(sha1_hex); BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@vec, @rsp); diff --git a/ext/Digest/SHA/t/2-nist-sha-224.t b/ext/Digest/SHA/t/2-nist-sha-224.t index 7dc5a1869e..8923a83fcb 100644 --- a/ext/Digest/SHA/t/2-nist-sha-224.t +++ b/ext/Digest/SHA/t/2-nist-sha-224.t @@ -4,15 +4,15 @@ use integer; use Digest::SHA qw(sha224_hex); BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@vec, @rsp); -BEGIN { +BEGIN { @vec = ( "abc", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", @@ -25,7 +25,7 @@ BEGIN { "20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67" ); - plan tests => scalar(@vec); + plan tests => scalar(@vec); } for (my $i = 0; $i < @vec; $i++) { diff --git a/ext/Digest/SHA/t/2-nist-sha-256.t b/ext/Digest/SHA/t/2-nist-sha-256.t index a7d5d0ceeb..67528ab33d 100644 --- a/ext/Digest/SHA/t/2-nist-sha-256.t +++ b/ext/Digest/SHA/t/2-nist-sha-256.t @@ -4,15 +4,15 @@ use integer; use Digest::SHA qw(sha256_hex); BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@vec, @rsp); -BEGIN { +BEGIN { @vec = ( "abc", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", diff --git a/ext/Digest/SHA/t/2-nist-sha-384.t b/ext/Digest/SHA/t/2-nist-sha-384.t index 2ffd737db3..87e4c0b979 100644 --- a/ext/Digest/SHA/t/2-nist-sha-384.t +++ b/ext/Digest/SHA/t/2-nist-sha-384.t @@ -4,15 +4,15 @@ use integer; use Digest::SHA qw(sha384_hex); BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@vec, @rsp); -BEGIN { +BEGIN { @vec = ( "abc", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu", @@ -25,7 +25,7 @@ BEGIN { "9d0e1809716474cb086e834e310a4a1ced149e9c00f248527972cec5704c2a5b07b8b3dc38ecc4ebae97ddd87f3d8985" ); - plan tests => scalar(@vec); + plan tests => scalar(@vec); } my $skip = sha384_hex("") ? 0 : 1; diff --git a/ext/Digest/SHA/t/2-nist-sha-512.t b/ext/Digest/SHA/t/2-nist-sha-512.t index f5fd31162c..c24c5a9a32 100644 --- a/ext/Digest/SHA/t/2-nist-sha-512.t +++ b/ext/Digest/SHA/t/2-nist-sha-512.t @@ -4,15 +4,15 @@ use integer; use Digest::SHA qw(sha512_hex); BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@vec, @rsp); -BEGIN { +BEGIN { @vec = ( "abc", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu", diff --git a/ext/Digest/SHA/t/2-nist-sha-base64.t b/ext/Digest/SHA/t/2-nist-sha-base64.t index 8eccb80c37..3d6dd5d86f 100644 --- a/ext/Digest/SHA/t/2-nist-sha-base64.t +++ b/ext/Digest/SHA/t/2-nist-sha-base64.t @@ -4,15 +4,15 @@ use integer; use Digest::SHA qw(sha1_base64 sha224_base64 sha256_base64 sha384_base64 sha512_base64); BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@vec, $data); -BEGIN { +BEGIN { $data = "abc"; @vec = ( \&sha1_base64, "qZk+NkcGgWq6PiVxeFDCbJzQ2J0", diff --git a/ext/Digest/SHA/t/2-nist-sha-oo.t b/ext/Digest/SHA/t/2-nist-sha-oo.t index e0e363b453..deefce9cb0 100644 --- a/ext/Digest/SHA/t/2-nist-sha-oo.t +++ b/ext/Digest/SHA/t/2-nist-sha-oo.t @@ -6,15 +6,15 @@ use File::Spec; use Digest::SHA; BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@vec); -BEGIN { +BEGIN { @vec = ( "ungWv48Bz+pBQUDeXa4iI7ADYaOWF3qctBD/YfIAFa0", "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1" diff --git a/ext/Digest/SHA/t/2-nist-vectors-bit.t b/ext/Digest/SHA/t/2-nist-vectors-bit.t index b17ad12566..0cd32eb0f1 100644 --- a/ext/Digest/SHA/t/2-nist-vectors-bit.t +++ b/ext/Digest/SHA/t/2-nist-vectors-bit.t @@ -13,16 +13,16 @@ use File::Spec; use Digest::SHA; BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my @hashes; BEGIN { - my $file = dirname($0) . "/nist/bit-hashes.sha1"; + my $file = File::Spec->catfile(dirname($0), "nist", "bit-hashes.sha1"); my $datafile = File::Spec->canonpath($file); open(F, $datafile); while (<F>) { @@ -60,7 +60,7 @@ my $hash; my $type3 = 0; my $ctx = Digest::SHA->new(1); -my $file = dirname($0) . "/nist/bit-messages.sha1"; +my $file = File::Spec->catfile(dirname($0), "nist", "bit-messages.sha1"); my $datafile = File::Spec->canonpath($file); open(F, $datafile); while (<F>) { diff --git a/ext/Digest/SHA/t/2-nist-vectors-byte.t b/ext/Digest/SHA/t/2-nist-vectors-byte.t index 51bae67b07..32dfb7c858 100644 --- a/ext/Digest/SHA/t/2-nist-vectors-byte.t +++ b/ext/Digest/SHA/t/2-nist-vectors-byte.t @@ -13,16 +13,16 @@ use File::Spec; use Digest::SHA; BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my @hashes; BEGIN { - my $file = dirname($0) . "/nist/byte-hashes.sha1"; + my $file = File::Spec->catfile(dirname($0), "nist", "byte-hashes.sha1"); my $datafile = File::Spec->canonpath($file); open(F, $datafile); while (<F>) { @@ -60,7 +60,7 @@ my $hash; my $type3 = 0; my $ctx = Digest::SHA->new(1); -my $file = dirname($0) . "/nist/byte-messages.sha1"; +my $file = File::Spec->catfile(dirname($0), "nist", "byte-messages.sha1"); my $datafile = File::Spec->canonpath($file); open(F, $datafile); while (<F>) { diff --git a/ext/Digest/SHA/t/3-gillogly-easy.t b/ext/Digest/SHA/t/3-gillogly-easy.t index 4a473630ef..1be7ec5813 100644 --- a/ext/Digest/SHA/t/3-gillogly-easy.t +++ b/ext/Digest/SHA/t/3-gillogly-easy.t @@ -8,10 +8,10 @@ use integer; use Digest::SHA; BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } # SHA-1 Test Vectors @@ -38,7 +38,7 @@ BEGIN { my(@vec); -BEGIN { +BEGIN { @vec = ( "110",148,"11","ce7387ae577337be54ea94f82c842e8be76bc3e1", "110",149,"","de244f063142cb2f4c903b7f7660577f9e0d8791", diff --git a/ext/Digest/SHA/t/3-gillogly-hard.t b/ext/Digest/SHA/t/3-gillogly-hard.t index 372f7c1ded..a8169aad44 100644 --- a/ext/Digest/SHA/t/3-gillogly-hard.t +++ b/ext/Digest/SHA/t/3-gillogly-hard.t @@ -10,10 +10,10 @@ use File::Spec; use Digest::SHA; BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } # SHA-1 Test Vectors @@ -37,7 +37,7 @@ BEGIN { my(@vec110, @vec011); -BEGIN { +BEGIN { @vec110 = ( # 110 rep 1431655764 "11", "1eef5a18969255a3b1793a2a955c7ec28cd221a5", "110", "7a1045b914672aface8d90e6d19b3a6ada3cb879", @@ -51,11 +51,11 @@ BEGIN { "0110", "a3d7438c589b0b932aa91cc2446f06df9abc73f0", "01101", "3eee3e1e28dede2ca444d68da5675b2faaab3203" ); - plan tests => scalar(@vec110) / 2 + scalar(@vec011) / 2; + plan tests => scalar(@vec110) / 2 + scalar(@vec011) / 2; } -my $fileSTATE110 = dirname($0) . "/gillogly/state.110"; -my $fileSTATE011 = dirname($0) . "/gillogly/state.011"; +my $fileSTATE110 = File::Spec->catfile(dirname($0), "gillogly", "state.110"); +my $fileSTATE011 = File::Spec->catfile(dirname($0), "gillogly", "state.011"); my $STATE110 = File::Spec->canonpath($fileSTATE110); my $STATE011 = File::Spec->canonpath($fileSTATE011); diff --git a/ext/Digest/SHA/t/4-bitstr-increasing.t b/ext/Digest/SHA/t/4-bitstr-increasing.t index de39d79f71..61e9a8e5d2 100644 --- a/ext/Digest/SHA/t/4-bitstr-increasing.t +++ b/ext/Digest/SHA/t/4-bitstr-increasing.t @@ -4,10 +4,10 @@ use integer; use Digest::SHA; BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } BEGIN { plan tests => 1 } diff --git a/ext/Digest/SHA/t/4-bitstr-large.t b/ext/Digest/SHA/t/4-bitstr-large.t index 7ccc7a6310..3939405ea5 100644 --- a/ext/Digest/SHA/t/4-bitstr-large.t +++ b/ext/Digest/SHA/t/4-bitstr-large.t @@ -4,10 +4,10 @@ use integer; use Digest::SHA; BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } BEGIN { plan tests => 1 } diff --git a/ext/Digest/SHA/t/4-bitstr-random.t b/ext/Digest/SHA/t/4-bitstr-random.t index cf4be92e32..137449a901 100644 --- a/ext/Digest/SHA/t/4-bitstr-random.t +++ b/ext/Digest/SHA/t/4-bitstr-random.t @@ -4,10 +4,10 @@ use integer; use Digest::SHA; BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } BEGIN { plan tests => 1 } diff --git a/ext/Digest/SHA/t/5-hmac-fips198.t b/ext/Digest/SHA/t/5-hmac-fips198.t index 422f4857c8..07c8c91c05 100644 --- a/ext/Digest/SHA/t/5-hmac-fips198.t +++ b/ext/Digest/SHA/t/5-hmac-fips198.t @@ -4,15 +4,15 @@ use integer; use Digest::SHA qw(hmac_sha1_hex); BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@vec); -BEGIN { +BEGIN { @vec = ( "Sample #1", "Sample #2", diff --git a/ext/Digest/SHA/t/5-hmac-rfc2202.t b/ext/Digest/SHA/t/5-hmac-rfc2202.t index a3cc281ce5..f441b614ae 100644 --- a/ext/Digest/SHA/t/5-hmac-rfc2202.t +++ b/ext/Digest/SHA/t/5-hmac-rfc2202.t @@ -4,15 +4,15 @@ use integer; use Digest::SHA qw(hmac_sha1_hex); BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@vec); -BEGIN { +BEGIN { @vec = ( "Hi There", "what do ya want for nothing?", diff --git a/ext/Digest/SHA/t/5-hmac-sha-256.t b/ext/Digest/SHA/t/5-hmac-sha-256.t index 619ce0c0aa..6a778352fa 100644 --- a/ext/Digest/SHA/t/5-hmac-sha-256.t +++ b/ext/Digest/SHA/t/5-hmac-sha-256.t @@ -6,15 +6,15 @@ use integer; use Digest::SHA qw(hmac_sha256_hex); BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@data); -BEGIN { +BEGIN { @data = ( "abc", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", diff --git a/ext/Digest/SHA/t/5-hmac-woodbury.t b/ext/Digest/SHA/t/5-hmac-woodbury.t index a9b96287ee..18782f75cb 100644 --- a/ext/Digest/SHA/t/5-hmac-woodbury.t +++ b/ext/Digest/SHA/t/5-hmac-woodbury.t @@ -8,10 +8,10 @@ use integer; use Digest::SHA qw(hmac_sha256_hex hmac_sha384_hex hmac_sha512_hex); BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } BEGIN { plan tests => 21 } diff --git a/ext/Digest/SHA/t/6-dump-load.t b/ext/Digest/SHA/t/6-dump-load.t index 2373a204ed..27336bd9b3 100644 --- a/ext/Digest/SHA/t/6-dump-load.t +++ b/ext/Digest/SHA/t/6-dump-load.t @@ -6,15 +6,15 @@ use File::Basename qw(dirname); use File::Spec; BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } my(@sharsp); -BEGIN { +BEGIN { @sharsp = ( "34aa973cd4c4daa4f61eeb2bdbad27316534016f", "cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0", @@ -43,8 +43,8 @@ for (my $i = 0; $i < @sharsp; $i++) { my $state; my $file; my $filename; - $filename = File::Spec->catfile(dirname($0), - "state", "state." . $ext[$i]); + $filename = File::Spec->catfile(dirname($0), + "state", "state.$ext[$i]"); $file = File::Spec->canonpath($filename); unless ($state = Digest::SHA->load($file)) { $state = Digest::SHA->new($ext[$i]); diff --git a/ext/Digest/SHA/t/7-ireland.t b/ext/Digest/SHA/t/7-ireland.t index 5ddbcfd01c..2deb097a70 100644 --- a/ext/Digest/SHA/t/7-ireland.t +++ b/ext/Digest/SHA/t/7-ireland.t @@ -5,10 +5,10 @@ use File::Spec; use Digest::SHA; BEGIN { - if ($ENV{PERL_CORE}) { - chdir 't' if -d 't'; - @INC = '../lib'; - } + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = '../lib'; + } } # David Ireland's test vector - SHA-256 digest of "a" x 536870912 @@ -18,7 +18,7 @@ BEGIN { BEGIN { plan tests => 1 } -my $filename = dirname($0) . "/ireland.tmp"; +my $filename = File::Spec->catfile(dirname($0), "ireland.tmp"); my $file = File::Spec->canonpath($filename); open(F, ">$file"); while (<DATA>) { print F $_ } close(F); |