- Pacman-dev - lists.archlinux.org

[pacman-dev] shellcheck conformity for makepkg
by Alad Wenter 08 Oct '16

08 Oct '16

shellcheck is a static analysis tool to check common mistakes in shell scripting. Running it on makepkg yields 116 warnings; below I propose how to address some of them. The idea would be that each warning, if applicable, is addressed in a separate patch. * /usr/bin/makepkg:138:10: warning: Declare and assign separately to avoid masking return values. [SC2155] makepkg does separate declare and assign statements _if_ it wants to exit on the failure of the assignment. Keeping this separation consistent is both more clear and avoids later possible mistakes should further "|| exit" clauses be desired. https://github.com/koalaman/shellcheck/wiki/SC2155 * /usr/bin/makepkg:149:16: error: Double quote array expansions to avoid re-splitting elements. [SC2068] /usr/bin/makepkg:170:14: note: Double quote to prevent globbing and word splitting. [SC2086] General quoting errors: https://github.com/koalaman/shellcheck/wiki/SC2068 https://github.com/koalaman/shellcheck/wiki/SC2086 * /usr/bin/makepkg:291:32: warning: Use "$@" (with quotes) to prevent whitespace problems. [SC2048] The line in question is: deplist="$(set +E; check_deps $*)" || exit 1 I'm not sure why this needs to be a single, unquoted string; the check_deps function itself uses "$@". * /usr/bin/makepkg:314:8: note: Use grep -q instead of comparing output with [ -n .. ]. [SC2143] The line in question is: if [[ -n $(grep -xvFf <(printf '%s\n' "${current_pkglist[@]}") \ <(printf '%s\n' "${original_pkglist[@]}")) ]]; then Instead of an extra -n test, grep -q would do. https://github.com/koalaman/shellcheck/wiki/SC2143 * /usr/bin/makepkg:323:11: warning: Expanding an array without an index only gives the first element. [SC2128] For example: mapfile -t filename < <(find "$pkgdir" -type f -name $p\*) if [[ $filename ]]; then It should always clear from the code that arrays are used; if you simply want to check if it is empty, ${filename[*]} can be used. https://github.com/koalaman/shellcheck/wiki/SC2128 * /usr/bin/makepkg:404:1: warning: generate_checksums references arguments, but none are ever passed. [SC2120] /usr/bin/makepkg:2181:2: note: Use generate_checksums "$@" if function's $1 should mean script's $1. [SC2119] This function accounts for arguments, but seems only used without them in the GENINTEG if list. * /usr/bin/makepkg:659:11: note: $/${} is unnecessary on arithmetic variables. [SC2004] https://github.com/koalaman/shellcheck/wiki/SC2004 * /usr/bin/makepkg:666:13: warning: Don't use variables in the printf format string. Use printf "..%s.." "$foo". [SC2059] https://github.com/koalaman/shellcheck/wiki/SC2059 * /usr/bin/makepkg:1138:23: warning: url is referenced but not assigned. [SC2154] There's a few of these; not sure this is an issue since these are optional variables in a PKGBUILD and we don't have set -u. * /usr/bin/makepkg:1224:22: note: Use ./*glob* or -- *glob* so names with dashes won't become options. [SC2035] Though it seems unlikely to compress a file starting in a slash, ./ adds some safety; it doesn't impact the used nullglob: # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob LANG=C bsdtar -czf .MTREE --format=mtree \ --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \ "${comp_files[@]}" * https://github.com/koalaman/shellcheck/wiki/SC2035 * /usr/bin/makepkg:1298:8: warning: Variable was used as an array but is now assigned a string. [SC2178] This seems to be a false positive since filename is an array elsewhere in the script, but here it is a local. * /usr/bin/makepkg:1666:27: error: Braces are required when expanding arrays, as in ${array[idx]}. [SC1087] Shellcheck probably isn't aware of the eval construct. * /usr/bin/makepkg:1700:11: warning: Remove space after = if trying to assign a value (for empty string, use var='' ... ). [SC1007] The "local foo=" style is only used here, and "local foo" would have the same effect. * /usr/bin/makepkg:1996:18: warning: Use single quotes, otherwise this expands now rather than when signalled. [SC2064] There's a few nested quotes here, I guess it works as intended ... * /usr/bin/makepkg:2068:10: warning: Exporting an expansion rather than a variable. [SC2163] Probably as intended * /usr/bin/makepkg:2350:11: warning: Use "${var:?}" to ensure this never expands to /* . [SC2115] Well, makepkg can't run as root since 4.2, but good to add this anyway. https://github.com/koalaman/shellcheck/wiki/SC2115 Alad

2 1

[pacman-dev] [PATCH] makepkg: Move parseopts from library to libmakepkg
by Alad Wenter 08 Oct '16

08 Oct '16

--- scripts/libmakepkg/util/option.sh | 157 ++++++++++++++++++++++++++++++++++++++ scripts/library/README | 20 ----- scripts/library/parseopts.sh | 137 --------------------------------- scripts/makepkg.sh.in | 2 - 4 files changed, 157 insertions(+), 159 deletions(-) delete mode 100644 scripts/library/parseopts.sh diff --git a/scripts/libmakepkg/util/option.sh b/scripts/libmakepkg/util/option.sh index 54ba474..4d5fd78 100644 --- a/scripts/libmakepkg/util/option.sh +++ b/scripts/libmakepkg/util/option.sh @@ -140,3 +140,160 @@ check_buildoption() { # not found return 127 } + + +# parseopts.sh: +# A getopt_long-like parser which portably supports longopts and +# shortopts with some GNU extensions. It does not allow for options +# with optional arguments. For both short and long opts, options +# requiring an argument should be suffixed with a colon. After the +# first argument containing the short opts, any number of valid long +# opts may be be passed. The end of the options delimiter must then be +# added, followed by the user arguments to the calling program. +# +# Recommended Usage: +# OPT_SHORT='fb:z' +# OPT_LONG=('foo' 'bar:' 'baz') +# if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then +# exit 1 +# fi +# set -- "${OPTRET[@]}" +# Returns: +# 0: parse success +# 1: parse failure (error message supplied) +parseopts() { + local opt= optarg= i= shortopts=$1 + local -a longopts=() unused_argv=() + + shift + while [[ $1 && $1 != '--' ]]; do + longopts+=("$1") + shift + done + shift + + longoptmatch() { + local o longmatch=() + for o in "${longopts[@]}"; do + if [[ ${o%:} = "$1" ]]; then + longmatch=("$o") + break + fi + [[ ${o%:} = "$1"* ]] && longmatch+=("$o") + done + + case ${#longmatch[*]} in + 1) + # success, override with opt and return arg req (0 == none, 1 == required) + opt=${longmatch%:} + if [[ $longmatch = *: ]]; then + return 1 + else + return 0 + fi ;; + 0) + # fail, no match found + return 255 ;; + *) + # fail, ambiguous match + printf "@SCRIPTNAME@: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" + printf " '%s'" "${longmatch[@]%:}" + printf '\n' + return 254 ;; + esac >&2 + } + + while (( $# )); do + case $1 in + --) # explicit end of options + shift + break + ;; + -[!-]*) # short option + for (( i = 1; i < ${#1}; i++ )); do + opt=${1:i:1} + + # option doesn't exist + if [[ $shortopts != *$opt* ]]; then + printf "@SCRIPTNAME@: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + fi + + OPTRET+=("-$opt") + # option requires optarg + if [[ $shortopts = *$opt:* ]]; then + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("${1:i+1}") + break + # if we're at the end, grab the the next positional, if it exists + elif (( i == ${#1} - 1 )) && [[ $2 ]]; then + OPTRET+=("$2") + shift + break + # parse failure + else + printf "@SCRIPTNAME@: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + fi + fi + done + ;; + --?*=*|--?*) # long option + IFS='=' read -r opt optarg <<< "${1#--}" + longoptmatch "$opt" + case $? in + 0) + # parse failure + if [[ $optarg ]]; then + printf "@SCRIPTNAME@: $(gettext "option '%s' does not allow an argument")\n" "--$opt" >&2 + OPTRET=(--) + return 1 + # --longopt + else + OPTRET+=("--$opt") + fi + ;; + 1) + # --longopt=optarg + if [[ $optarg ]]; then + OPTRET+=("--$opt" "$optarg") + # --longopt optarg + elif [[ $2 ]]; then + OPTRET+=("--$opt" "$2" ) + shift + # parse failure + else + printf "@SCRIPTNAME@: $(gettext "option '%s' requires an argument")\n" "--$opt" >&2 + OPTRET=(--) + return 1 + fi + ;; + 254) + # ambiguous option -- error was reported for us by longoptmatch() + OPTRET=(--) + return 1 + ;; + 255) + # parse failure + printf "@SCRIPTNAME@: $(gettext "invalid option") '--%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + ;; + esac + ;; + *) # non-option arg encountered, add it as a parameter + unused_argv+=("$1") + ;; + esac + shift + done + + # add end-of-opt terminator and any leftover positional parameters + OPTRET+=('--' "${unused_argv[@]}" "$@") + unset longoptmatch + + return 0 +} diff --git a/scripts/library/README b/scripts/library/README index e9615a2..a9d15f1 100644 --- a/scripts/library/README +++ b/scripts/library/README @@ -8,26 +8,6 @@ stdout and can be silenced by defining 'QUIET'. The 'warning' and 'error' functions print to stderr with the appropriate prefix added to the message. -parseopts.sh: -A getopt_long-like parser which portably supports longopts and shortopts -with some GNU extensions. It does not allow for options with optional -arguments. For both short and long opts, options requiring an argument -should be suffixed with a colon. After the first argument containing -the short opts, any number of valid long opts may be be passed. The end -of the options delimiter must then be added, followed by the user arguments -to the calling program. - -Recommended Usage: - OPT_SHORT='fb:z' - OPT_LONG=('foo' 'bar:' 'baz') - if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then - exit 1 - fi - set -- "${OPTRET[@]}" -Returns: - 0: parse success - 1: parse failure (error message supplied) - human_to_size.sh: A function to convert human readable sizes (such as "5.3 GiB") to raw byte equivalents. base10 and base2 suffixes are supported, case sensitively. If diff --git a/scripts/library/parseopts.sh b/scripts/library/parseopts.sh deleted file mode 100644 index cf6aa6c..0000000 --- a/scripts/library/parseopts.sh +++ /dev/null @@ -1,137 +0,0 @@ -# getopt-like parser -parseopts() { - local opt= optarg= i= shortopts=$1 - local -a longopts=() unused_argv=() - - shift - while [[ $1 && $1 != '--' ]]; do - longopts+=("$1") - shift - done - shift - - longoptmatch() { - local o longmatch=() - for o in "${longopts[@]}"; do - if [[ ${o%:} = "$1" ]]; then - longmatch=("$o") - break - fi - [[ ${o%:} = "$1"* ]] && longmatch+=("$o") - done - - case ${#longmatch[*]} in - 1) - # success, override with opt and return arg req (0 == none, 1 == required) - opt=${longmatch%:} - if [[ $longmatch = *: ]]; then - return 1 - else - return 0 - fi ;; - 0) - # fail, no match found - return 255 ;; - *) - # fail, ambiguous match - printf "@SCRIPTNAME@: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" - printf " '%s'" "${longmatch[@]%:}" - printf '\n' - return 254 ;; - esac >&2 - } - - while (( $# )); do - case $1 in - --) # explicit end of options - shift - break - ;; - -[!-]*) # short option - for (( i = 1; i < ${#1}; i++ )); do - opt=${1:i:1} - - # option doesn't exist - if [[ $shortopts != *$opt* ]]; then - printf "@SCRIPTNAME@: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - fi - - OPTRET+=("-$opt") - # option requires optarg - if [[ $shortopts = *$opt:* ]]; then - # if we're not at the end of the option chunk, the rest is the optarg - if (( i < ${#1} - 1 )); then - OPTRET+=("${1:i+1}") - break - # if we're at the end, grab the the next positional, if it exists - elif (( i == ${#1} - 1 )) && [[ $2 ]]; then - OPTRET+=("$2") - shift - break - # parse failure - else - printf "@SCRIPTNAME@: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - fi - fi - done - ;; - --?*=*|--?*) # long option - IFS='=' read -r opt optarg <<< "${1#--}" - longoptmatch "$opt" - case $? in - 0) - # parse failure - if [[ $optarg ]]; then - printf "@SCRIPTNAME@: $(gettext "option '%s' does not allow an argument")\n" "--$opt" >&2 - OPTRET=(--) - return 1 - # --longopt - else - OPTRET+=("--$opt") - fi - ;; - 1) - # --longopt=optarg - if [[ $optarg ]]; then - OPTRET+=("--$opt" "$optarg") - # --longopt optarg - elif [[ $2 ]]; then - OPTRET+=("--$opt" "$2" ) - shift - # parse failure - else - printf "@SCRIPTNAME@: $(gettext "option '%s' requires an argument")\n" "--$opt" >&2 - OPTRET=(--) - return 1 - fi - ;; - 254) - # ambiguous option -- error was reported for us by longoptmatch() - OPTRET=(--) - return 1 - ;; - 255) - # parse failure - printf "@SCRIPTNAME@: $(gettext "invalid option") '--%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - ;; - esac - ;; - *) # non-option arg encountered, add it as a parameter - unused_argv+=("$1") - ;; - esac - shift - done - - # add end-of-opt terminator and any leftover positional parameters - OPTRET+=('--' "${unused_argv[@]}" "$@") - unset longoptmatch - - return 0 -} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b2ce51..b3cafa8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1153,8 +1153,6 @@ run_split_packaging() { pkgname=("${pkgname_backup[@]}") } -m4_include(library/parseopts.sh) - usage() { printf "makepkg (pacman) %s\n" "$makepkg_version" echo -- 2.10.0

1 0

[pacman-dev] [RFC, PATCHES]: Very preliminary work towards clean build with clang -Weverything
by ivy.foster＠gmail.com 01 Oct '16

01 Oct '16

First of all, don't worry; I'm under no illusion that the pie-in-the-sky Subject line is anything that will happen in the near future, nor even necessarily a goal for the project (given just how finicky -Weverything is). Basically, I'm wondering whether sporadic patches addressing the sorts of things "clang -Weverything" gripes about would be considered welcome contributions, or nitpicking. By "sporadic patches", I mean that any of this sort from me would come when I felt like working on a coding project but didn't have anything particularly in mind. As a sample, I've made two patches addressing some of its earliest warnings. The first changes several headers to (say) #define IDENTIFIERS rather than _IDENTIFIERS. The second adds ALPM_ERR_OK = 0 to the _alpm_err_t enum. Some functions which return an _alpm_err_t return value were returning 0 on success, but there was no 0 value enumerated--not actively harmful, but still an oddity. If this sort of thing isn't of interest, I definitely get it. I just figured that an RFC with patches attached would provide something more concrete to discuss than one without. Cheers, Ivy

5 9

[pacman-dev] [PATCH] Remove pacman-optimize
by Allan McRae 01 Oct '16

01 Oct '16

The people who believe that pacman-optimize is actually doing something useful are the same people who are voting for Trump. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/.gitignore | 1 - scripts/Makefile.am | 6 -- scripts/pacman-optimize.sh.in | 189 ------------------------------------------ 3 files changed, 196 deletions(-) delete mode 100644 scripts/pacman-optimize.sh.in diff --git a/scripts/.gitignore b/scripts/.gitignore index 8dac503..b0cb23f 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -3,7 +3,6 @@ makepkg-template makepkg-wrapper pacman-db-upgrade pacman-key -pacman-optimize pkgdelta repo-add repo-elephant diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e4f9fb1..8662496 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -15,7 +15,6 @@ OURSCRIPTS = \ makepkg \ pacman-db-upgrade \ pacman-key \ - pacman-optimize \ pkgdelta \ repo-add @@ -25,7 +24,6 @@ EXTRA_DIST = \ makepkg-wrapper.sh.in \ pacman-db-upgrade.sh.in \ pacman-key.sh.in \ - pacman-optimize.sh.in \ pkgdelta.sh.in \ repo-add.sh.in \ $(LIBRARY) \ @@ -182,10 +180,6 @@ pacman-key: \ $(srcdir)/library/output_format.sh \ $(srcdir)/library/parseopts.sh -pacman-optimize: \ - $(srcdir)/pacman-optimize.sh.in \ - $(srcdir)/library/output_format.sh - pkgdelta: \ $(srcdir)/pkgdelta.sh.in \ $(srcdir)/library/output_format.sh \ diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in deleted file mode 100644 index f5ad924..0000000 -- 2.10.0

1 0

[pacman-dev] [PATCH 00/11] Streamline syntax of contrib scripts
by Gordian Edenhofer 01 Oct '16

01 Oct '16

Reorganize scripts in contrib to fit the syntax and style of makepkg. Unify multiple different approaches to e.g. write a usage function, handle options and differences in naming schemas for options. Gordian Edenhofer (11): checkupdates: streamline usage function paccache: streamline usage function pacdiff: streamline usage function pacdiff: proper option handling pacdiff: streamline option syntax with makepkg paclist: streamline usage function paclog-pkglist: streamline usage function pacscripts: streamline usage function updpkgsums: streamline usage function rankmirrors: streamline usage function rankmirrors: proper option handling contrib/checkupdates.sh.in | 9 +-- contrib/paccache.sh.in | 61 ++++++++++---------- contrib/pacdiff.sh.in | 76 +++++++++++++++---------- contrib/paclist.sh.in | 10 ++-- contrib/paclog-pkglist.sh.in | 12 ++-- contrib/pacscripts.sh.in | 18 +++--- contrib/rankmirrors.sh.in | 132 +++++++++++++++++++++---------------------- contrib/updpkgsums.sh.in | 21 ++++--- 8 files changed, 179 insertions(+), 160 deletions(-) -- 2.10.0

5 53

[pacman-dev] [PATCH] Give a "success!" message on database check
by Patrick Eigensatz 01 Oct '16

01 Oct '16

'pacman -Dk' prints a "success!" message if there were no errors. It is possible to suppress the output using the '-q / --quiet' flag. This implements the feature discussed at https://bugs.archlinux.org/task/50087 Signed-off-by: Patrick Eigensatz <patrick.eigensatz(a)gmail.com> --- src/pacman/database.c | 4 ++++ src/pacman/pacman.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/pacman/database.c b/src/pacman/database.c index 0197903..5143031 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -286,6 +286,10 @@ int pacman_database(alpm_list_t *targets) } else { ret = check_db_sync(); } + + if(ret == 0 && !config->quiet) { + printf(_("success!\n")); + } } if(config->flags & (ALPM_TRANS_FLAG_ALLDEPS | ALPM_TRANS_FLAG_ALLEXPLICIT)) { diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index be52d1b..b477df7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -466,6 +466,10 @@ static int parsearg_database(int opt) case 'k': (config->op_q_check)++; break; + case OP_QUIET: + case 'q': + config->quiet = 1; + break; default: return 1; } -- 2.10.0

5 7

[pacman-dev] [PATCH] fix --printsrcinfo unify arch and non-arch specific variables
by Levente Polyak 01 Oct '16

01 Oct '16

This fixes the issue with --printsrcinfo that all arch specific variants of a variable get merged into their non arch specific variant. The .SRCINFO file ends up having $depends containing $depends_x86_64 and omitting the latter. --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b2ce51..82c9367 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1476,7 +1476,7 @@ pkgbase=${pkgbase:-${pkgname[0]}} # check the PKGBUILD for some basic requirements lint_pkgbuild || exit 1 -if (( !SOURCEONLY )); then +if (( !SOURCEONLY && !PRINTSRCINFO )); then merge_arch_attrs fi -- 2.10.0

2 1

Re: [pacman-dev] [PATCH 01/11] checkupdates: streamline usage function
by Dave Reisner 29 Sep '16

29 Sep '16

On Sep 29, 2016 06:23, "Gordian Edenhofer" <gordian.edenhofer(a)gmail.com> wrote: Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> --- contrib/checkupdates.sh.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index ff62891..8c04370 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -25,13 +25,14 @@ m4_include(../scripts/library/output_format.sh) m4_include(../scripts/library/term_colors.sh) if (( $# > 0 )); then - echo "${myname} (pacman) v${myver}" + printf "%s (pacman) %s\n" "$myname" "$myver" echo - echo "Safely print a list of pending updates" + printf -- "$(gettext "Safely print a list of pending updates")\n" echo - echo "Usage: ${myname}" + printf -- "$(gettext "Usage: %s")\n" "$0" + echo + printf -- "$(gettext "Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.")\n" This is broken -- double quotes do not nest like this, and they're effectively dropped. I also question the value of adding gettext support to untranslated scripts and including flag/envvar names as part of the translatable strings -- that won't end well as some translator *will* get it wrong. echo - echo 'Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.' exit 0 fi -- 2.10.0

3 2

[pacman-dev] Fwd: [arch-general] Removing infinality
by Martin Kühne 28 Sep '16

28 Sep '16

...actually, would a mechanism like beneath implemented natively in pacman be worth a feature request? cheers! mar77i ---------- Forwarded message ---------- From: Martin Kühne <mysatyre(a)gmail.com> Date: Tue, Sep 27, 2016 at 2:46 PM Subject: Re: [arch-general] Removing infinality To: General Discussion about Arch Linux <arch-general(a)archlinux.org> Just a thought. If you find the excerpt in the pacman logs where you did the transaction got you into this mess, you might be able to reverse just that without risking too much for the current install and save you a complete reinstall. Ignoring dependencies is then not so bad, because you then just install the packages again that were uninstalled to get you into this. cheers! mar77i

2 3

[pacman-dev] [PATCH] [RFC] Remove internal md5 and sha2 implementations
by Allan McRae 27 Sep '16

27 Sep '16

The internal implementations for md5 and sha256 checksums have not been merged from upstream sources for a long time. Instead of us carrying copies of code from other projects, we should just support building against multiple libraries that provide such functionality. This patch removes the md5 and sha2 code (originally obtained from PolarSSL) from our repository. The configure script will now error if at least one library supporting checksum generation is not present, with the only library currently supported being openssl. It will be relatively simple for other such libraries to be supported if anyone wishes to add them. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- The PolarSSL code has not been merged since 2010. PolarSSL has not existed for over a year... configure.ac | 5 + lib/libalpm/Makefile.am | 6 - lib/libalpm/md5.c | 333 ------------------------------------------- lib/libalpm/md5.h | 60 -------- lib/libalpm/sha2.c | 370 ------------------------------------------------ lib/libalpm/sha2.h | 65 --------- lib/libalpm/util.c | 3 - 7 files changed, 5 insertions(+), 837 deletions(-) delete mode 100644 lib/libalpm/md5.c delete mode 100644 lib/libalpm/md5.h delete mode 100644 lib/libalpm/sha2.c delete mode 100644 lib/libalpm/sha2.h diff --git a/configure.ac b/configure.ac index c9515f2..ae017d1 100644 --- a/configure.ac +++ b/configure.ac @@ -229,6 +229,11 @@ if test "x$with_openssl" != "xno"; then fi AM_CONDITIONAL(HAVE_LIBSSL, [test "$have_openssl" = "yes"]) +# Ensure one library for generating checksums is present +if test "$have_openssl" != "yes"; then + AC_MSG_ERROR([*** no library for checksum generation found]) +fi + # Check for libcurl have_libcurl=no if test "x$with_libcurl" != "xno"; then diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 4272ae7..945a612 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -58,12 +58,6 @@ libalpm_la_SOURCES = \ util-common.h util-common.c \ version.c -if !HAVE_LIBSSL -libalpm_la_SOURCES += \ - md5.h md5.c \ - sha2.h sha2.c -endif - libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) libalpm_la_CFLAGS = \ diff --git a/lib/libalpm/md5.c b/lib/libalpm/md5.c deleted file mode 100644 index 0d5ed9e..0000000 --- a/lib/libalpm/md5.c +++ /dev/null @@ -1,333 +0,0 @@ -/* - * RFC 1321 compliant MD5 implementation - * - * Copyright (C) 2006-2010, Brainspark B.V. - * - * This file is part of PolarSSL (http://www.polarssl.org) - * Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org> - * - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -/* - * The MD5 algorithm was designed by Ron Rivest in 1991. - * - * http://www.ietf.org/rfc/rfc1321.txt - */ -/* - * Pacman Notes: - * - * Taken from the PolarSSL project at http://polarssl.org under terms of the - * GPL. This is from version 1.0.0 of the library, and has been modified - * as following, which may be helpful for future updates: - * * remove "polarssl/config.h" include - * * change include from "polarssl/md5.h" to "md5.h" - * * removal of HMAC code - * * removal of SELF_TEST code - * * removal of ipad and opad from the md5_context struct in md5.h - * * increase the size of buffer for performance reasons - * * change 'unsigned long' to uint32_t - */ - -#include <stdio.h> -#include <stdint.h> - -#include "md5.h" - -/* - * 32-bit integer manipulation macros (little endian) - */ -#ifndef GET_U32_LE -#define GET_U32_LE(n,b,i) \ -{ \ - (n) = ( (uint32_t) (b)[(i) ] ) \ - | ( (uint32_t) (b)[(i) + 1] << 8 ) \ - | ( (uint32_t) (b)[(i) + 2] << 16 ) \ - | ( (uint32_t) (b)[(i) + 3] << 24 ); \ -} -#endif - -#ifndef PUT_U32_LE -#define PUT_U32_LE(n,b,i) \ -{ \ - (b)[(i) ] = (unsigned char) ( (n) ); \ - (b)[(i) + 1] = (unsigned char) ( (n) >> 8 ); \ - (b)[(i) + 2] = (unsigned char) ( (n) >> 16 ); \ - (b)[(i) + 3] = (unsigned char) ( (n) >> 24 ); \ -} -#endif - -/* - * MD5 context setup - */ -static void md5_starts( md5_context *ctx ) -{ - ctx->total[0] = 0; - ctx->total[1] = 0; - - ctx->state[0] = 0x67452301; - ctx->state[1] = 0xEFCDAB89; - ctx->state[2] = 0x98BADCFE; - ctx->state[3] = 0x10325476; -} - -static void md5_process( md5_context *ctx, const unsigned char data[64] ) -{ - uint32_t X[16], A, B, C, D; - - GET_U32_LE( X[ 0], data, 0 ); - GET_U32_LE( X[ 1], data, 4 ); - GET_U32_LE( X[ 2], data, 8 ); - GET_U32_LE( X[ 3], data, 12 ); - GET_U32_LE( X[ 4], data, 16 ); - GET_U32_LE( X[ 5], data, 20 ); - GET_U32_LE( X[ 6], data, 24 ); - GET_U32_LE( X[ 7], data, 28 ); - GET_U32_LE( X[ 8], data, 32 ); - GET_U32_LE( X[ 9], data, 36 ); - GET_U32_LE( X[10], data, 40 ); - GET_U32_LE( X[11], data, 44 ); - GET_U32_LE( X[12], data, 48 ); - GET_U32_LE( X[13], data, 52 ); - GET_U32_LE( X[14], data, 56 ); - GET_U32_LE( X[15], data, 60 ); - -#define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n))) - -#define P(a,b,c,d,k,s,t) \ -{ \ - a += F(b,c,d) + X[k] + t; a = S(a,s) + b; \ -} - - A = ctx->state[0]; - B = ctx->state[1]; - C = ctx->state[2]; - D = ctx->state[3]; - -#define F(x,y,z) (z ^ (x & (y ^ z))) - - P( A, B, C, D, 0, 7, 0xD76AA478 ); - P( D, A, B, C, 1, 12, 0xE8C7B756 ); - P( C, D, A, B, 2, 17, 0x242070DB ); - P( B, C, D, A, 3, 22, 0xC1BDCEEE ); - P( A, B, C, D, 4, 7, 0xF57C0FAF ); - P( D, A, B, C, 5, 12, 0x4787C62A ); - P( C, D, A, B, 6, 17, 0xA8304613 ); - P( B, C, D, A, 7, 22, 0xFD469501 ); - P( A, B, C, D, 8, 7, 0x698098D8 ); - P( D, A, B, C, 9, 12, 0x8B44F7AF ); - P( C, D, A, B, 10, 17, 0xFFFF5BB1 ); - P( B, C, D, A, 11, 22, 0x895CD7BE ); - P( A, B, C, D, 12, 7, 0x6B901122 ); - P( D, A, B, C, 13, 12, 0xFD987193 ); - P( C, D, A, B, 14, 17, 0xA679438E ); - P( B, C, D, A, 15, 22, 0x49B40821 ); - -#undef F - -#define F(x,y,z) (y ^ (z & (x ^ y))) - - P( A, B, C, D, 1, 5, 0xF61E2562 ); - P( D, A, B, C, 6, 9, 0xC040B340 ); - P( C, D, A, B, 11, 14, 0x265E5A51 ); - P( B, C, D, A, 0, 20, 0xE9B6C7AA ); - P( A, B, C, D, 5, 5, 0xD62F105D ); - P( D, A, B, C, 10, 9, 0x02441453 ); - P( C, D, A, B, 15, 14, 0xD8A1E681 ); - P( B, C, D, A, 4, 20, 0xE7D3FBC8 ); - P( A, B, C, D, 9, 5, 0x21E1CDE6 ); - P( D, A, B, C, 14, 9, 0xC33707D6 ); - P( C, D, A, B, 3, 14, 0xF4D50D87 ); - P( B, C, D, A, 8, 20, 0x455A14ED ); - P( A, B, C, D, 13, 5, 0xA9E3E905 ); - P( D, A, B, C, 2, 9, 0xFCEFA3F8 ); - P( C, D, A, B, 7, 14, 0x676F02D9 ); - P( B, C, D, A, 12, 20, 0x8D2A4C8A ); - -#undef F - -#define F(x,y,z) (x ^ y ^ z) - - P( A, B, C, D, 5, 4, 0xFFFA3942 ); - P( D, A, B, C, 8, 11, 0x8771F681 ); - P( C, D, A, B, 11, 16, 0x6D9D6122 ); - P( B, C, D, A, 14, 23, 0xFDE5380C ); - P( A, B, C, D, 1, 4, 0xA4BEEA44 ); - P( D, A, B, C, 4, 11, 0x4BDECFA9 ); - P( C, D, A, B, 7, 16, 0xF6BB4B60 ); - P( B, C, D, A, 10, 23, 0xBEBFBC70 ); - P( A, B, C, D, 13, 4, 0x289B7EC6 ); - P( D, A, B, C, 0, 11, 0xEAA127FA ); - P( C, D, A, B, 3, 16, 0xD4EF3085 ); - P( B, C, D, A, 6, 23, 0x04881D05 ); - P( A, B, C, D, 9, 4, 0xD9D4D039 ); - P( D, A, B, C, 12, 11, 0xE6DB99E5 ); - P( C, D, A, B, 15, 16, 0x1FA27CF8 ); - P( B, C, D, A, 2, 23, 0xC4AC5665 ); - -#undef F - -#define F(x,y,z) (y ^ (x | ~z)) - - P( A, B, C, D, 0, 6, 0xF4292244 ); - P( D, A, B, C, 7, 10, 0x432AFF97 ); - P( C, D, A, B, 14, 15, 0xAB9423A7 ); - P( B, C, D, A, 5, 21, 0xFC93A039 ); - P( A, B, C, D, 12, 6, 0x655B59C3 ); - P( D, A, B, C, 3, 10, 0x8F0CCC92 ); - P( C, D, A, B, 10, 15, 0xFFEFF47D ); - P( B, C, D, A, 1, 21, 0x85845DD1 ); - P( A, B, C, D, 8, 6, 0x6FA87E4F ); - P( D, A, B, C, 15, 10, 0xFE2CE6E0 ); - P( C, D, A, B, 6, 15, 0xA3014314 ); - P( B, C, D, A, 13, 21, 0x4E0811A1 ); - P( A, B, C, D, 4, 6, 0xF7537E82 ); - P( D, A, B, C, 11, 10, 0xBD3AF235 ); - P( C, D, A, B, 2, 15, 0x2AD7D2BB ); - P( B, C, D, A, 9, 21, 0xEB86D391 ); - -#undef F - - ctx->state[0] += A; - ctx->state[1] += B; - ctx->state[2] += C; - ctx->state[3] += D; -} - -/* - * MD5 process buffer - */ -static void md5_update( md5_context *ctx, const unsigned char *input, size_t ilen ) -{ - size_t fill; - uint32_t left; - - if( ilen <= 0 ) - return; - - left = ctx->total[0] & 0x3F; - fill = 64 - left; - - ctx->total[0] += (uint32_t) ilen; - ctx->total[0] &= 0xFFFFFFFF; - - if( ctx->total[0] < (uint32_t) ilen ) - ctx->total[1]++; - - if( left && ilen >= fill ) - { - memcpy( (void *) (ctx->buffer + left), - (void *) input, fill ); - md5_process( ctx, ctx->buffer ); - input += fill; - ilen -= fill; - left = 0; - } - - while( ilen >= 64 ) - { - md5_process( ctx, input ); - input += 64; - ilen -= 64; - } - - if( ilen > 0 ) - { - memcpy( (void *) (ctx->buffer + left), - (void *) input, ilen ); - } -} - -static const unsigned char md5_padding[64] = -{ - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/* - * MD5 final digest - */ -static void md5_finish( md5_context *ctx, unsigned char output[16] ) -{ - uint32_t last, padn; - uint32_t high, low; - unsigned char msglen[8]; - - high = ( ctx->total[0] >> 29 ) - | ( ctx->total[1] << 3 ); - low = ( ctx->total[0] << 3 ); - - PUT_U32_LE( low, msglen, 0 ); - PUT_U32_LE( high, msglen, 4 ); - - last = ctx->total[0] & 0x3F; - padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last ); - - md5_update( ctx, (unsigned char *) md5_padding, padn ); - md5_update( ctx, msglen, 8 ); - - PUT_U32_LE( ctx->state[0], output, 0 ); - PUT_U32_LE( ctx->state[1], output, 4 ); - PUT_U32_LE( ctx->state[2], output, 8 ); - PUT_U32_LE( ctx->state[3], output, 12 ); -} - -/* - * output = MD5( input buffer ) - */ -void md5( const unsigned char *input, size_t ilen, unsigned char output[16] ) -{ - md5_context ctx; - - md5_starts( &ctx ); - md5_update( &ctx, input, ilen ); - md5_finish( &ctx, output ); - - memset( &ctx, 0, sizeof( md5_context ) ); -} - -/* - * output = MD5( file contents ) - */ -int md5_file( const char *path, unsigned char output[16] ) -{ - FILE *f; - size_t n; - md5_context ctx; - unsigned char buf[4096]; - - if( ( f = fopen( path, "rb" ) ) == NULL ) - return( 1 ); - - md5_starts( &ctx ); - - while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 ) - md5_update( &ctx, buf, n ); - - md5_finish( &ctx, output ); - - memset( &ctx, 0, sizeof( md5_context ) ); - - if( ferror( f ) != 0 ) - { - fclose( f ); - return( 2 ); - } - - fclose( f ); - return( 0 ); -} diff --git a/lib/libalpm/md5.h b/lib/libalpm/md5.h deleted file mode 100644 index 4a6fe4d..0000000 --- a/lib/libalpm/md5.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * RFC 1321 compliant MD5 implementation - * - * Copyright (C) 2006-2010, Brainspark B.V. - * - * This file is part of PolarSSL (http://www.polarssl.org) - * Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org> - * - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#ifndef MD5_H -#define MD5_H - -#include <string.h> - -/** - * \brief MD5 context structure - */ -typedef struct -{ - unsigned long total[2]; /*!< number of bytes processed */ - unsigned long state[4]; /*!< intermediate digest state */ - unsigned char buffer[64]; /*!< data block being processed */ -} -md5_context; - -/** - * \brief Output = MD5( input buffer ) - * - * \param input buffer holding the data - * \param ilen length of the input data - * \param output MD5 checksum result - */ -void md5( const unsigned char *input, size_t ilen, unsigned char output[16] ); - -/** - * \brief Output = MD5( file contents ) - * - * \param path input file name - * \param output MD5 checksum result - * - * \return 0 if successful, 1 if fopen failed, - * or 2 if fread failed - */ -int md5_file( const char *path, unsigned char output[16] ); - -#endif /* md5.h */ diff --git a/lib/libalpm/sha2.c b/lib/libalpm/sha2.c deleted file mode 100644 index 366dc65..0000000 --- a/lib/libalpm/sha2.c +++ /dev/null @@ -1,370 +0,0 @@ -/* - * FIPS-180-2 compliant SHA-256 implementation - * - * Copyright (C) 2006-2010, Brainspark B.V. - * - * This file is part of PolarSSL (http://www.polarssl.org) - * Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org> - * - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -/* - * The SHA-256 Secure Hash Standard was published by NIST in 2002. - * - * http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf - */ -/* - * Pacman Notes: - * - * Taken from the PolarSSL project at http://polarssl.org under terms of the - * GPL. This is from version 1.0.0 of the library, and has been modified - * as following, which may be helpful for future updates: - * * remove "polarssl/config.h" include - * * change include from "polarssl/md5.h" to "md5.h" - * * removal of HMAC code - * * removal of SELF_TEST code - * * removal of ipad and opad from the sha2_context struct in sha2.h - * * increase the size of buffer for performance reasons - * * change 'unsigned long' to uint32_t - */ - -#include <stdio.h> -#include <stdint.h> - -#include "sha2.h" - -/* - * 32-bit integer manipulation macros (big endian) - */ -#ifndef GET_U32_BE -#define GET_U32_BE(n,b,i) \ -{ \ - (n) = ( (uint32_t) (b)[(i) ] << 24 ) \ - | ( (uint32_t) (b)[(i) + 1] << 16 ) \ - | ( (uint32_t) (b)[(i) + 2] << 8 ) \ - | ( (uint32_t) (b)[(i) + 3] ); \ -} -#endif - -#ifndef PUT_U32_BE -#define PUT_U32_BE(n,b,i) \ -{ \ - (b)[(i) ] = (unsigned char) ( (n) >> 24 ); \ - (b)[(i) + 1] = (unsigned char) ( (n) >> 16 ); \ - (b)[(i) + 2] = (unsigned char) ( (n) >> 8 ); \ - (b)[(i) + 3] = (unsigned char) ( (n) ); \ -} -#endif - -/* - * SHA-256 context setup - */ -static void sha2_starts( sha2_context *ctx, int is224 ) -{ - ctx->total[0] = 0; - ctx->total[1] = 0; - - if( is224 == 0 ) - { - /* SHA-256 */ - ctx->state[0] = 0x6A09E667; - ctx->state[1] = 0xBB67AE85; - ctx->state[2] = 0x3C6EF372; - ctx->state[3] = 0xA54FF53A; - ctx->state[4] = 0x510E527F; - ctx->state[5] = 0x9B05688C; - ctx->state[6] = 0x1F83D9AB; - ctx->state[7] = 0x5BE0CD19; - } - else - { - /* SHA-224 */ - ctx->state[0] = 0xC1059ED8; - ctx->state[1] = 0x367CD507; - ctx->state[2] = 0x3070DD17; - ctx->state[3] = 0xF70E5939; - ctx->state[4] = 0xFFC00B31; - ctx->state[5] = 0x68581511; - ctx->state[6] = 0x64F98FA7; - ctx->state[7] = 0xBEFA4FA4; - } - - ctx->is224 = is224; -} - -static void sha2_process( sha2_context *ctx, const unsigned char data[64] ) -{ - uint32_t temp1, temp2, W[64]; - uint32_t A, B, C, D, E, F, G, H; - - GET_U32_BE( W[ 0], data, 0 ); - GET_U32_BE( W[ 1], data, 4 ); - GET_U32_BE( W[ 2], data, 8 ); - GET_U32_BE( W[ 3], data, 12 ); - GET_U32_BE( W[ 4], data, 16 ); - GET_U32_BE( W[ 5], data, 20 ); - GET_U32_BE( W[ 6], data, 24 ); - GET_U32_BE( W[ 7], data, 28 ); - GET_U32_BE( W[ 8], data, 32 ); - GET_U32_BE( W[ 9], data, 36 ); - GET_U32_BE( W[10], data, 40 ); - GET_U32_BE( W[11], data, 44 ); - GET_U32_BE( W[12], data, 48 ); - GET_U32_BE( W[13], data, 52 ); - GET_U32_BE( W[14], data, 56 ); - GET_U32_BE( W[15], data, 60 ); - -#define SHR(x,n) ((x & 0xFFFFFFFF) >> n) -#define ROTR(x,n) (SHR(x,n) | (x << (32 - n))) - -#define S0(x) (ROTR(x, 7) ^ ROTR(x,18) ^ SHR(x, 3)) -#define S1(x) (ROTR(x,17) ^ ROTR(x,19) ^ SHR(x,10)) - -#define S2(x) (ROTR(x, 2) ^ ROTR(x,13) ^ ROTR(x,22)) -#define S3(x) (ROTR(x, 6) ^ ROTR(x,11) ^ ROTR(x,25)) - -#define F0(x,y,z) ((x & y) | (z & (x | y))) -#define F1(x,y,z) (z ^ (x & (y ^ z))) - -#define R(t) \ -( \ - W[t] = S1(W[t - 2]) + W[t - 7] + \ - S0(W[t - 15]) + W[t - 16] \ -) - -#define P(a,b,c,d,e,f,g,h,x,K) \ -{ \ - temp1 = h + S3(e) + F1(e,f,g) + K + x; \ - temp2 = S2(a) + F0(a,b,c); \ - d += temp1; h = temp1 + temp2; \ -} - - A = ctx->state[0]; - B = ctx->state[1]; - C = ctx->state[2]; - D = ctx->state[3]; - E = ctx->state[4]; - F = ctx->state[5]; - G = ctx->state[6]; - H = ctx->state[7]; - - P( A, B, C, D, E, F, G, H, W[ 0], 0x428A2F98 ); - P( H, A, B, C, D, E, F, G, W[ 1], 0x71374491 ); - P( G, H, A, B, C, D, E, F, W[ 2], 0xB5C0FBCF ); - P( F, G, H, A, B, C, D, E, W[ 3], 0xE9B5DBA5 ); - P( E, F, G, H, A, B, C, D, W[ 4], 0x3956C25B ); - P( D, E, F, G, H, A, B, C, W[ 5], 0x59F111F1 ); - P( C, D, E, F, G, H, A, B, W[ 6], 0x923F82A4 ); - P( B, C, D, E, F, G, H, A, W[ 7], 0xAB1C5ED5 ); - P( A, B, C, D, E, F, G, H, W[ 8], 0xD807AA98 ); - P( H, A, B, C, D, E, F, G, W[ 9], 0x12835B01 ); - P( G, H, A, B, C, D, E, F, W[10], 0x243185BE ); - P( F, G, H, A, B, C, D, E, W[11], 0x550C7DC3 ); - P( E, F, G, H, A, B, C, D, W[12], 0x72BE5D74 ); - P( D, E, F, G, H, A, B, C, W[13], 0x80DEB1FE ); - P( C, D, E, F, G, H, A, B, W[14], 0x9BDC06A7 ); - P( B, C, D, E, F, G, H, A, W[15], 0xC19BF174 ); - P( A, B, C, D, E, F, G, H, R(16), 0xE49B69C1 ); - P( H, A, B, C, D, E, F, G, R(17), 0xEFBE4786 ); - P( G, H, A, B, C, D, E, F, R(18), 0x0FC19DC6 ); - P( F, G, H, A, B, C, D, E, R(19), 0x240CA1CC ); - P( E, F, G, H, A, B, C, D, R(20), 0x2DE92C6F ); - P( D, E, F, G, H, A, B, C, R(21), 0x4A7484AA ); - P( C, D, E, F, G, H, A, B, R(22), 0x5CB0A9DC ); - P( B, C, D, E, F, G, H, A, R(23), 0x76F988DA ); - P( A, B, C, D, E, F, G, H, R(24), 0x983E5152 ); - P( H, A, B, C, D, E, F, G, R(25), 0xA831C66D ); - P( G, H, A, B, C, D, E, F, R(26), 0xB00327C8 ); - P( F, G, H, A, B, C, D, E, R(27), 0xBF597FC7 ); - P( E, F, G, H, A, B, C, D, R(28), 0xC6E00BF3 ); - P( D, E, F, G, H, A, B, C, R(29), 0xD5A79147 ); - P( C, D, E, F, G, H, A, B, R(30), 0x06CA6351 ); - P( B, C, D, E, F, G, H, A, R(31), 0x14292967 ); - P( A, B, C, D, E, F, G, H, R(32), 0x27B70A85 ); - P( H, A, B, C, D, E, F, G, R(33), 0x2E1B2138 ); - P( G, H, A, B, C, D, E, F, R(34), 0x4D2C6DFC ); - P( F, G, H, A, B, C, D, E, R(35), 0x53380D13 ); - P( E, F, G, H, A, B, C, D, R(36), 0x650A7354 ); - P( D, E, F, G, H, A, B, C, R(37), 0x766A0ABB ); - P( C, D, E, F, G, H, A, B, R(38), 0x81C2C92E ); - P( B, C, D, E, F, G, H, A, R(39), 0x92722C85 ); - P( A, B, C, D, E, F, G, H, R(40), 0xA2BFE8A1 ); - P( H, A, B, C, D, E, F, G, R(41), 0xA81A664B ); - P( G, H, A, B, C, D, E, F, R(42), 0xC24B8B70 ); - P( F, G, H, A, B, C, D, E, R(43), 0xC76C51A3 ); - P( E, F, G, H, A, B, C, D, R(44), 0xD192E819 ); - P( D, E, F, G, H, A, B, C, R(45), 0xD6990624 ); - P( C, D, E, F, G, H, A, B, R(46), 0xF40E3585 ); - P( B, C, D, E, F, G, H, A, R(47), 0x106AA070 ); - P( A, B, C, D, E, F, G, H, R(48), 0x19A4C116 ); - P( H, A, B, C, D, E, F, G, R(49), 0x1E376C08 ); - P( G, H, A, B, C, D, E, F, R(50), 0x2748774C ); - P( F, G, H, A, B, C, D, E, R(51), 0x34B0BCB5 ); - P( E, F, G, H, A, B, C, D, R(52), 0x391C0CB3 ); - P( D, E, F, G, H, A, B, C, R(53), 0x4ED8AA4A ); - P( C, D, E, F, G, H, A, B, R(54), 0x5B9CCA4F ); - P( B, C, D, E, F, G, H, A, R(55), 0x682E6FF3 ); - P( A, B, C, D, E, F, G, H, R(56), 0x748F82EE ); - P( H, A, B, C, D, E, F, G, R(57), 0x78A5636F ); - P( G, H, A, B, C, D, E, F, R(58), 0x84C87814 ); - P( F, G, H, A, B, C, D, E, R(59), 0x8CC70208 ); - P( E, F, G, H, A, B, C, D, R(60), 0x90BEFFFA ); - P( D, E, F, G, H, A, B, C, R(61), 0xA4506CEB ); - P( C, D, E, F, G, H, A, B, R(62), 0xBEF9A3F7 ); - P( B, C, D, E, F, G, H, A, R(63), 0xC67178F2 ); - - ctx->state[0] += A; - ctx->state[1] += B; - ctx->state[2] += C; - ctx->state[3] += D; - ctx->state[4] += E; - ctx->state[5] += F; - ctx->state[6] += G; - ctx->state[7] += H; -} - -/* - * SHA-256 process buffer - */ -static void sha2_update( sha2_context *ctx, const unsigned char *input, size_t ilen ) -{ - size_t fill; - uint32_t left; - - if( ilen <= 0 ) - return; - - left = ctx->total[0] & 0x3F; - fill = 64 - left; - - ctx->total[0] += (uint32_t) ilen; - ctx->total[0] &= 0xFFFFFFFF; - - if( ctx->total[0] < (uint32_t) ilen ) - ctx->total[1]++; - - if( left && ilen >= fill ) - { - memcpy( (void *) (ctx->buffer + left), - (void *) input, fill ); - sha2_process( ctx, ctx->buffer ); - input += fill; - ilen -= fill; - left = 0; - } - - while( ilen >= 64 ) - { - sha2_process( ctx, input ); - input += 64; - ilen -= 64; - } - - if( ilen > 0 ) - { - memcpy( (void *) (ctx->buffer + left), - (void *) input, ilen ); - } -} - -static const unsigned char sha2_padding[64] = -{ - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/* - * SHA-256 final digest - */ -static void sha2_finish( sha2_context *ctx, unsigned char output[32] ) -{ - uint32_t last, padn; - uint32_t high, low; - unsigned char msglen[8]; - - high = ( ctx->total[0] >> 29 ) - | ( ctx->total[1] << 3 ); - low = ( ctx->total[0] << 3 ); - - PUT_U32_BE( high, msglen, 0 ); - PUT_U32_BE( low, msglen, 4 ); - - last = ctx->total[0] & 0x3F; - padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last ); - - sha2_update( ctx, (unsigned char *) sha2_padding, padn ); - sha2_update( ctx, msglen, 8 ); - - PUT_U32_BE( ctx->state[0], output, 0 ); - PUT_U32_BE( ctx->state[1], output, 4 ); - PUT_U32_BE( ctx->state[2], output, 8 ); - PUT_U32_BE( ctx->state[3], output, 12 ); - PUT_U32_BE( ctx->state[4], output, 16 ); - PUT_U32_BE( ctx->state[5], output, 20 ); - PUT_U32_BE( ctx->state[6], output, 24 ); - - if( ctx->is224 == 0 ) - PUT_U32_BE( ctx->state[7], output, 28 ); -} - -/* - * output = SHA-256( input buffer ) - */ -void sha2( const unsigned char *input, size_t ilen, - unsigned char output[32], int is224 ) -{ - sha2_context ctx; - - sha2_starts( &ctx, is224 ); - sha2_update( &ctx, input, ilen ); - sha2_finish( &ctx, output ); - - memset( &ctx, 0, sizeof( sha2_context ) ); -} - -/* - * output = SHA-256( file contents ) - */ -int sha2_file( const char *path, unsigned char output[32], int is224 ) -{ - FILE *f; - size_t n; - sha2_context ctx; - unsigned char buf[4096]; - - if( ( f = fopen( path, "rb" ) ) == NULL ) - return( 1 ); - - sha2_starts( &ctx, is224 ); - - while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 ) - sha2_update( &ctx, buf, n ); - - sha2_finish( &ctx, output ); - - memset( &ctx, 0, sizeof( sha2_context ) ); - - if( ferror( f ) != 0 ) - { - fclose( f ); - return( 2 ); - } - - fclose( f ); - return( 0 ); -} diff --git a/lib/libalpm/sha2.h b/lib/libalpm/sha2.h deleted file mode 100644 index 99267de..0000000 --- a/lib/libalpm/sha2.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * SHA-224 and SHA-256 cryptographic hash function - * - * Copyright (C) 2006-2010, Brainspark B.V. - * - * This file is part of PolarSSL (http://www.polarssl.org) - * Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org> - * - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#ifndef SHA2_H -#define SHA2_H - -#include <string.h> - -/** - * \brief SHA-256 context structure - */ -typedef struct -{ - unsigned long total[2]; /*!< number of bytes processed */ - unsigned long state[8]; /*!< intermediate digest state */ - unsigned char buffer[64]; /*!< data block being processed */ - - int is224; /*!< 0 => SHA-256, else SHA-224 */ -} -sha2_context; - -/** - * \brief Output = SHA-256( input buffer ) - * - * \param input buffer holding the data - * \param ilen length of the input data - * \param output SHA-224/256 checksum result - * \param is224 0 = use SHA256, 1 = use SHA224 - */ -void sha2( const unsigned char *input, size_t ilen, - unsigned char output[32], int is224 ); - -/** - * \brief Output = SHA-256( file contents ) - * - * \param path input file name - * \param output SHA-224/256 checksum result - * \param is224 0 = use SHA256, 1 = use SHA224 - * - * \return 0 if successful, 1 if fopen failed, - * or 2 if fread failed - */ -int sha2_file( const char *path, unsigned char output[32], int is224 ); - -#endif /* sha2.h */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 1e55463..40a72c6 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -40,9 +40,6 @@ #ifdef HAVE_LIBSSL #include <openssl/md5.h> #include <openssl/sha.h> -#else -#include "md5.h" -#include "sha2.h" #endif /* libalpm */ -- 2.9.3

2 2