From: Matt Birkholz Date: Tue, 5 Jun 2018 20:46:27 +0000 (-0700) Subject: mhash: Punt. The µmodule-based package disappeared long ago. X-Git-Tag: mit-scheme-pucked-x11-0.3.1~6^2 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=74e54b6ad7146ab40fac92fcc9e629c1d88caa2c;p=mit-scheme.git mhash: Punt. The µmodule-based package disappeared long ago. --- diff --git a/doc/user-manual/user.texinfo b/doc/user-manual/user.texinfo index 2b049c8a6..445624569 100644 --- a/doc/user-manual/user.texinfo +++ b/doc/user-manual/user.texinfo @@ -284,8 +284,6 @@ libssl-dev (-lcrypto) libgdbm-dev (-lgdbm) @item MCRYPT libmcrypt-dev (-lmcrypt) -@item MHASH -libmhash-dev (-lmhash) @item PGSQL libpq-dev (-lpq) @item X11 diff --git a/src/README.txt b/src/README.txt index 63dfa0708..d41d3f22f 100644 --- a/src/README.txt +++ b/src/README.txt @@ -81,7 +81,11 @@ There are a few C/Unix FFI plugins: * "mcrypt" wraps libmcrypt and provides replacements for the mcrypt-* procedures implemented in (runtime crypto). -* "mhash" wraps libmhash. +* "pgsql" wraps libpq and provides a drop-in replacement for the + microcode module based package (runtime postgresql). + +* "x11" wraps libX11 and provides a drop-in replacement for the + microcode module based package (runtime x-graphics). These are miscellaneous extras: diff --git a/src/Tags.sh b/src/Tags.sh index a7ae44e0b..b8df303fc 100755 --- a/src/Tags.sh +++ b/src/Tags.sh @@ -37,7 +37,6 @@ DEFAULT_SUBDIRS=( \ gdbm \ imail \ mcrypt \ - mhash \ microcode \ pgsql \ runtime \ diff --git a/src/mhash/AUTHORS b/src/mhash/AUTHORS deleted file mode 100644 index da34b96e1..000000000 --- a/src/mhash/AUTHORS +++ /dev/null @@ -1,6 +0,0 @@ -To find out what should go in this file, see "Information For -Maintainers of GNU Software" (maintain.texi), the section called -"Recording Changes". - -Matt Birkholz The conversion to a plugin. -The MIT/GNU Scheme Team The original (runtime crypto) package. diff --git a/src/mhash/COPYING b/src/mhash/COPYING deleted file mode 100644 index bf50f20de..000000000 --- a/src/mhash/COPYING +++ /dev/null @@ -1,482 +0,0 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if -you distribute copies of the library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, so that any problems introduced by others will not reflect on -the original authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the source code distributed need not include anything that is normally -distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307 USA. - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/src/mhash/ChangeLog b/src/mhash/ChangeLog deleted file mode 100644 index 9a732ac7d..000000000 --- a/src/mhash/ChangeLog +++ /dev/null @@ -1,7 +0,0 @@ --*-Text-*- - -Please see the git commit log: - -$ git clone git://git.savannah.gnu.org/mit-scheme.git whatever -$ cd whatever/ -$ git log origin/master -- src/mhash/ | more diff --git a/src/mhash/Makefile.am b/src/mhash/Makefile.am deleted file mode 100644 index 5f5245787..000000000 --- a/src/mhash/Makefile.am +++ /dev/null @@ -1,120 +0,0 @@ -## Process this file with automake to produce Makefile.in -## -## Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, -## 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -## 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, -## 2015, 2016, 2017, 2018 Massachusetts Institute of Technology -## -## This file is part of MIT/GNU Scheme. -## -## MIT/GNU Scheme 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. -## -## MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -## USA. - -ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = autogen.sh - -MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ -scmlibdir = @MIT_SCHEME_LIBDIR@ -scmlib_subdir = $(scmlibdir)mhash -scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@ - -scmlib_LTLIBRARIES = mhash-shim.la -scmlib_DATA = mhash-types.bin mhash-const.bin - -sources = @MIT_SCHEME_SCMs@ -cdecls = mhash.cdecl - -binaries = @MIT_SCHEME_BCIs@ @MIT_SCHEME_COMs@ - -scmlib_sub_DATA = $(sources) $(binaries) -scmlib_sub_DATA += make.scm @MIT_SCHEME_PKD@ - -#info_TEXINFOS = mit-scheme-mhash.texi -#AM_MAKEINFOHTMLFLAGS = --no-split - -AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@ -AM_CFLAGS = @MIT_CFLAGS@ - -mhash_shim_la_LIBADD = mhash-adapter.lo -mhash_shim_la_LDFLAGS = -module -avoid-version -shared - -noinst_PROGRAMS = mhash-const -mhash_const_SOURCES = mhash-const.c mhash-shim.h - -mhash-shim.c: stamp-shim -mhash-const.c: stamp-shim -mhash-types.bin: stamp-shim -stamp-shim: mhash-shim.h $(cdecls) - touch stamp-shim - echo '(generate-shim "mhash" "#include \"mhash-shim.h\"")' \ - | $(MIT_SCHEME_EXE) --batch-mode \ - || rm stamp-shim - -mhash-const.bin: mhash-const.scm - echo '(sf "mhash-const")' | $(MIT_SCHEME_EXE) --batch-mode - -mhash-const.scm: mhash-const - ./mhash-const - -@MIT_SCHEME_DEPS@ -stamp-scheme: stamp-shim $(sources) mhash.pkg - touch stamp-scheme - if ! ./compile.sh; then rm stamp-scheme; exit 1; fi - -CLEANFILES = mhash-const* mhash-shim.c -CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd -CLEANFILES += stamp-shim stamp-scheme -CLEANFILES += @MIT_SCHEME_CLEAN@ - -TESTS = mhash-check.sh -CLEANFILES += sample - -tags: tags-am - ./tags-fix.sh mhash - -all_sources = $(sources) mhash-adapter.c -ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls) -TAGS_DEPENDENCIES = $(all_sources) $(cdecls) - -EXTRA_DIST += $(all_sources) $(cdecls) compile.scm mhash.pkg -EXTRA_DIST += mhash-check.scm mhash-check.sh -EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian - -install-data-hook: - ( echo '(add-plugin "mhash" "@MIT_SCHEME_PROJECT@"'; \ - echo ' ""'; \ - echo ' "$(DESTDIR)$(scmlibdir)"'; \ - echo ' "$(DESTDIR)$(scmdocdir)")' ) \ - | $(MIT_SCHEME_EXE) --batch-mode - -install-html: install-html-am - ( echo '(add-plugin "mhash" "@MIT_SCHEME_PROJECT@"'; \ - echo ' ""'; \ - echo ' "$(DESTDIR)$(scmlibdir)"'; \ - echo ' "$(DESTDIR)$(scmdocdir)")' ) \ - | $(MIT_SCHEME_EXE) --batch-mode - -install-info-am: - -uninstall-info-am: - -uninstall-hook: - ( echo '(remove-plugin "mhash" "@MIT_SCHEME_PROJECT@"'; \ - echo ' ""'; \ - echo ' "$(DESTDIR)$(scmlibdir)"'; \ - echo ' "$(DESTDIR)$(scmdocdir)")' ) \ - | $(MIT_SCHEME_EXE) --batch-mode - [ -d "$(DESTDIR)$(scmlib_subdir)" ] \ - && rmdir "$(DESTDIR)$(scmlib_subdir)" diff --git a/src/mhash/NEWS b/src/mhash/NEWS deleted file mode 100644 index 6d6efef9e..000000000 --- a/src/mhash/NEWS +++ /dev/null @@ -1,39 +0,0 @@ -mit-scheme-mhash NEWS -- history of user-visible changes. - -Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, - 2017, 2018 Massachusetts Institute of Technology - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme 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. - -MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -02110-1301, USA. - -mit-scheme-mhash 0.2 - Matt Birkholz, 2017-05-18 -================================================ - -Use byte vectors for binary data instead of strings. Thus all digests -and salts now must be byte vectors; the -update procedures must be fed -byte subvectors, not substrings. Other changes: mhash-bytevector was -added, mhash-string takes optional start and end indices, so mhash- -substring was removed, and mhash-sum->hexadecimal and mhash-sum-> -number were removed. The latter can be replaced by bytevector-> -hexadecimal and bytevector->exact-nonnegative-integer respectively. - -mit-scheme-mhash 0.1 - Matt Birkholz, 2016-02-19 -================================================ - -Use libtool and automake. diff --git a/src/mhash/README b/src/mhash/README deleted file mode 100644 index ce97f35b8..000000000 --- a/src/mhash/README +++ /dev/null @@ -1,28 +0,0 @@ -The Mhash option. - -This plugin creates an (mhash) package, a drop-in replacement for the -microcode module based mhash-* procedures in the (runtime crypto) -package. It is built in the customary GNU way: - - ./configure ... - make all check install - -To use: - - (load-option 'mhash) - (import-mhash) - -Import-mhash will modify the REPL's current environment by adding -bindings linked to the plugin's exports. They are not exported to the -global environment because they would conflict with the exports from -(runtime crypto). - -To import into a CREF package set, add this to your .pkg file: - - (global-definitions mhash/) - - (define-package (your package name) - (parent (your package parent)) - (import (mhash) - mhash-file - ...)) diff --git a/src/mhash/autogen.sh b/src/mhash/autogen.sh deleted file mode 100755 index 8af4031c7..000000000 --- a/src/mhash/autogen.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -set -e -rm -rf m4 -mkdir m4 -autoreconf --force --install -I m4 diff --git a/src/mhash/compile.scm b/src/mhash/compile.scm deleted file mode 100644 index 816740ca9..000000000 --- a/src/mhash/compile.scm +++ /dev/null @@ -1,8 +0,0 @@ -#| -*-Scheme-*- |# - -;;;; Compile the MHASH option. - -(load-option 'CREF) -(load-option 'FFI) -(compile-file "mhash" '() (->environment '(RUNTIME))) -(cref/generate-constructors "mhash") \ No newline at end of file diff --git a/src/mhash/compile.sh b/src/mhash/compile.sh deleted file mode 100755 index a83758aad..000000000 --- a/src/mhash/compile.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -*-Scheme-*- -# -# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, -# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, -# 2015, 2016, 2017 Massachusetts Institute of Technology -# -# This file is part of a mhash plugin for MIT/GNU Scheme. -# -# This plugin 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 plugin 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 plugin; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# Compile the Mhash option. - -set -e -: ${MIT_SCHEME_EXE=mit-scheme} -${MIT_SCHEME_EXE} --prepend-library . --batch-mode <<\EOF -(load "compile.scm") -EOF -suffix=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_EXE} --batch-mode` -report=mhash-$suffix.crf -if [ -s "$report" ]; then - echo "$0: warning: $report is not empty" - awk "{printf \"$report:%d: %s\\n\",NR,\$0}" $report - exit 1 -fi diff --git a/src/mhash/configure.ac b/src/mhash/configure.ac deleted file mode 100644 index efaeebe7b..000000000 --- a/src/mhash/configure.ac +++ /dev/null @@ -1,157 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.69]) -AC_INIT([MIT/GNU Scheme mhash plugin], - [0.2], - [bug-mit-scheme@gnu.org], - [mit-scheme-mhash]) -AC_CONFIG_SRCDIR([mhash.pkg]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) - -AC_COPYRIGHT( -[Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, - 2017, 2018 Massachusetts Institute of Technology - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme 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. - -MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. -]) - -AH_TOP([/* - -Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, - 2017, 2018 Massachusetts Institute of Technology - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme 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. - -MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -*/]) - -AM_INIT_AUTOMAKE - -LT_PREREQ([2.2.6]) -LT_INIT([dlopen]) - -AC_PROG_CC -AC_PROG_CPP -AC_PROG_INSTALL - -if test ${GCC} = yes; then - - MIT_CFLAGS="-Wall -Wundef -Wpointer-arith -Winline" - MIT_CFLAGS="${MIT_CFLAGS} -Wstrict-prototypes -Wnested-externs" - MIT_CFLAGS="${MIT_CFLAGS} -Wredundant-decls" - - AC_MSG_CHECKING([for GCC>=4]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ - #if __GNUC__ >= 4 - ; - #else - #error "gcc too old" - #endif - ]], - [[]] - )], - [ - AC_MSG_RESULT([yes]) - MIT_CFLAGS="${MIT_CFLAGS} -Wextra -Wno-sign-compare" - MIT_CFLAGS="${MIT_CFLAGS} -Wno-unused-parameter" - MIT_CFLAGS="${MIT_CFLAGS} -Wold-style-definition" - # The generated shim code violates this big-time. - # MIT_CFLAGS="${MIT_CFLAGS} -Wmissing-prototypes" - MIT_CFLAGS="${MIT_CFLAGS} -Wunreachable-code" - MIT_CFLAGS="${MIT_CFLAGS} -Wwrite-strings" - ], - [AC_MSG_RESULT([no])]) -fi - -AC_CHECK_HEADER([mhash.h],[],[ - AC_MSG_ERROR([Header file not found.])]) - -LIBS="-lmhash" - -MIT_SCHEME_PROJECT=mit-scheme -: ${MIT_SCHEME_EXE=mit-scheme} -MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ - echo " (system-library-directory-pathname)))" ) \ - | ${MIT_SCHEME_EXE} --batch-mode` -MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\ - echo " (directory-pathname" ;\ - echo " (system-library-pathname" ;\ - echo ' "mit-scheme.h"))))' ) \ - | ${MIT_SCHEME_EXE} --batch-mode` - -cc_type=`echo "(display microcode-id/compiled-code-type)" \ - | ${MIT_SCHEME_EXE} --batch-mode` -os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_EXE} --batch-mode` - -MIT_SCHEME_PKD="mhash-${os_suffix}.pkd" - -for f in mhash; do - MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm" - MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci" - MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} -${f}.bci: stamp-scheme" - if test "$cc_type" = "c"; then - MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.so" - MIT_SCHEME_CLEAN="${MIT_SCHEME_CLEAN} ${f}.c" - MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} -${f}.so: stamp-scheme" - else - MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.com" - MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} -${f}.com: stamp-scheme" - fi -done -MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS} -${MIT_SCHEME_PKD}: stamp-scheme" - -AC_SUBST([MIT_SCHEME_PROJECT]) -AC_SUBST([MIT_CFLAGS]) -AC_SUBST([MIT_SCHEME_EXE]) -AC_SUBST([MIT_SCHEME_LIBDIR]) -AC_SUBST([MIT_SCHEME_INCLUDEDIR]) -AC_SUBST([MIT_SCHEME_PKD]) -AC_SUBST([MIT_SCHEME_SCMs]) -AC_SUBST([MIT_SCHEME_BCIs]) -AC_SUBST([MIT_SCHEME_COMs]) -AC_SUBST([MIT_SCHEME_CLEAN]) -AC_SUBST([MIT_SCHEME_DEPS]) -AM_SUBST_NOTMAKE([MIT_SCHEME_DEPS]) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/src/mhash/make.scm b/src/mhash/make.scm deleted file mode 100644 index e0ab4b163..000000000 --- a/src/mhash/make.scm +++ /dev/null @@ -1,9 +0,0 @@ -#| -*-Scheme-*- |# - -;;;; Load the mhash option. - -(with-working-directory-pathname (directory-pathname (current-load-pathname)) - (lambda () - (load-package-set "mhash"))) - -(add-subsystem-identification! "mhash" '(0 2)) \ No newline at end of file diff --git a/src/mhash/mhash-adapter.c b/src/mhash/mhash-adapter.c deleted file mode 100644 index 15ee32dc7..000000000 --- a/src/mhash/mhash-adapter.c +++ /dev/null @@ -1,72 +0,0 @@ -/* -*-C-*- - -Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, - 2017, 2018 Massachusetts Institute of Technology - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme 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. - -MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -*/ - -/* Adapters for the mhash crypto-hash library. */ - -#include "mhash-shim.h" - -extern void -do_mhash (MHASH thread, const char *string, int start, int end) -{ - mhash (thread, string + start, end - start); -} - -extern void -do_mhash_end (MHASH context, char *string, size_t size) -{ - void * digest = mhash_end (context); - memcpy (string, digest, size); - free (digest); -} - -extern void -do_mhash_hmac_end (MHASH context, char *string, size_t size) -{ - void * digest = mhash_hmac_end (context); - memcpy (string, digest, size); - free (digest); -} - -extern int -do_mhash_keygen (keygenid algorithm, - hashid hashid1, hashid hashid2, - int count, - void *salt, int salt_size, - char *keyword, int keysize, - unsigned char *password, int passwordlen) -{ - KEYGEN keygen; - - keygen.hash_algorithm[0] = hashid1; - keygen.hash_algorithm[1] = hashid2; - keygen.count = count; - keygen.salt = salt; - keygen.salt_size = salt_size; - - return (mhash_keygen_ext (algorithm, keygen, - keyword, keysize, - password, passwordlen)); -} diff --git a/src/mhash/mhash-check.scm b/src/mhash/mhash-check.scm deleted file mode 100644 index d775416cf..000000000 --- a/src/mhash/mhash-check.scm +++ /dev/null @@ -1,37 +0,0 @@ -#| -*-Scheme-*- - -Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, - 2017, 2018 Massachusetts Institute of Technology - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme 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. - -MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -|# - -;;;; Test the MHASH option. - -(let ((sample "Some text to hash.")) - (let ((hash (bytevector->hexadecimal (mhash-string 'md5 sample)))) - (if (not (string=? hash "C8E89C4CBF3ABF9AA758D691CBE4B784")) - (error "Bad hash for sample text:" hash))) - (call-with-output-file "sample" - (lambda (port) (write-string sample port) (newline port))) - (let ((hash (bytevector->hexadecimal (mhash-file 'md5 "sample")))) - (if (not (string=? hash "43EB9ECCB88C329721925EFC04843AF1")) - (error "Bad hash for sample file:" hash)))) \ No newline at end of file diff --git a/src/mhash/mhash-check.sh b/src/mhash/mhash-check.sh deleted file mode 100755 index fb7038977..000000000 --- a/src/mhash/mhash-check.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# Test the MHASH option. - -set -e -${MIT_SCHEME_EXE} --prepend-library . <<\EOF -(load-option 'MHASH) -(load "mhash-check" (->environment '(mhash))) -EOF diff --git a/src/mhash/mhash-shim.h b/src/mhash/mhash-shim.h deleted file mode 100644 index 897aa0027..000000000 --- a/src/mhash/mhash-shim.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -*-C-*- - -Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, - 2017, 2018 Massachusetts Institute of Technology - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme 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. - -MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -*/ - -/* Interface to the mhash crypto-hash library. */ - -#include "config.h" - -#include - -extern void do_mhash (MHASH thread, const char *string, int start, int end); -extern void do_mhash_end (MHASH context, char *string, size_t size); -extern void do_mhash_hmac_end (MHASH context, char *string, size_t size); -extern int do_mhash_keygen (keygenid algorithm, - hashid hashid1, hashid hashid2, - int count, - void *salt, int salt_size, - char *keyword, int keysize, - unsigned char *password, int passwordlen); diff --git a/src/mhash/mhash.cdecl b/src/mhash/mhash.cdecl deleted file mode 100644 index 9050f1181..000000000 --- a/src/mhash/mhash.cdecl +++ /dev/null @@ -1,84 +0,0 @@ -#| -*-Scheme-*- - -Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, - 2017, 2018 Massachusetts Institute of Technology - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme 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. - -MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -|# - -;;;; C declarations for mhash-shim.so. - -(typedef MHASH (* MHASH_INSTANCE)) -(typedef hashid int) -(typedef keygenid int) - -(extern int mhash_count) -(extern (* char) mhash_get_hash_name (id hashid)) -(extern int mhash_get_block_size (id hashid)) -(extern int mhash_get_hash_pblock (id hashid)) - -(extern int mhash_keygen_count) -(extern (* uchar) mhash_get_keygen_name (id keygenid)) -(extern int mhash_get_keygen_salt_size (id keygenid)) -(extern int mhash_get_keygen_max_key_size (id keygenid)) -(extern int mhash_keygen_uses_salt (id keygenid)) -(extern int mhash_keygen_uses_count (id keygenid)) -(extern int mhash_keygen_uses_hash_algorithm (id keygenid)) - -(extern MHASH mhash_init (type hashid)) - -(extern void mhash_deinit (context MHASH) (digest (* void))) - -(extern void do_mhash - (thread MHASH) - (string (* (const char))) - (start int) - (end int)) - -(extern void do_mhash_end - (context MHASH) - (string (* char)) - (size int)) - -(extern MHASH mhash_hmac_init - (type hashid) - (key (* void)) - (keysize int) - (blocksize int)) - -(extern int mhash_hmac_deinit (context MHASH) (digest (* void))) - -(extern void do_mhash_hmac_end - (context MHASH) - (string (* char)) - (size int)) - -(extern int do_mhash_keygen - (id keygenid) - (hashid1 hashid) - (hashid2 hashid) - (count uint) - (salt (* void)) - (salt_size int) - (keyword (* char)) - (keysize int) - (password (* uchar)) - (passwordlen int)) \ No newline at end of file diff --git a/src/mhash/mhash.pkg b/src/mhash/mhash.pkg deleted file mode 100644 index 743478f60..000000000 --- a/src/mhash/mhash.pkg +++ /dev/null @@ -1,60 +0,0 @@ -#| -*-Scheme-*- - -Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, - 2017, 2018 Massachusetts Institute of Technology - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme 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. - -MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -|# - -(global-definitions runtime/) - -(define-package (mhash) - (files "mhash") - (parent ()) - (export () - import-mhash) - (initialization (initialize-package!)) - (export (mhash global) - make-mhash-keygen-type - mhash-bytevector - mhash-context? - mhash-end - mhash-file - mhash-get-block-size - mhash-hmac-end - mhash-hmac-init - mhash-hmac-update - mhash-init - mhash-keygen - mhash-keygen-max-key-size - mhash-keygen-salt-size - mhash-keygen-type-names - mhash-keygen-type? - mhash-keygen-uses-count? - mhash-keygen-uses-hash-algorithm - mhash-keygen-uses-salt? - mhash-string - mhash-type-names - mhash-update)) - -(define-package (mhash global) - ;; Just to get cref to analyze whether all exports are defined. - ) \ No newline at end of file diff --git a/src/mhash/mhash.scm b/src/mhash/mhash.scm deleted file mode 100644 index 086b71c26..000000000 --- a/src/mhash/mhash.scm +++ /dev/null @@ -1,502 +0,0 @@ -#| -*-Scheme-*- - -Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, - 2017, 2018 Massachusetts Institute of Technology - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme 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. - -MIT/GNU Scheme 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 MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -|# - -;;;; The mhash option. -;;; package: (mhash) - -(declare (usual-integrations)) - -(define (import-mhash) - (let ((target-environment (nearest-repl/environment)) - (source-environment (->environment '(mhash)))) - (for-each (lambda (name) - (link-variables target-environment name - source-environment name)) - '(make-mhash-keygen-type - mhash-bytevector - mhash-context? - mhash-end - mhash-file - mhash-get-block-size - mhash-hmac-end - mhash-hmac-init - mhash-hmac-update - mhash-init - mhash-keygen - mhash-keygen-max-key-size - mhash-keygen-salt-size - mhash-keygen-type-names - mhash-keygen-type? - mhash-keygen-uses-count? - mhash-keygen-uses-hash-algorithm - mhash-keygen-uses-salt? - mhash-string - mhash-type-names - mhash-update)))) - -(C-include "mhash") - -(define mhash-algorithm-names) -(define mhash-contexts '()) -(define mhash-hmac-contexts '()) -(define mhash-contexts-mutex) - -;;; Lock order: -;;; -;;; {mhash-context-mutex, mhash-hmac-context-mutex} -;;; -> mhash-contexts-mutex - -(define (add-context-cleanup context) - (with-thread-mutex-lock mhash-contexts-mutex - (lambda () - (set! mhash-contexts - (cons (weak-cons context (mhash-context-alien context)) - mhash-contexts))))) - -(define (add-hmac-context-cleanup context) - (with-thread-mutex-lock mhash-contexts-mutex - (lambda () - (set! mhash-hmac-contexts - (cons (weak-cons context (mhash-hmac-context-alien context)) - mhash-contexts))))) - -(define (remove-context-cleanup context) - (with-thread-mutex-lock mhash-contexts-mutex - (lambda () - (let ((entry (weak-assq context mhash-contexts))) - (if entry - (set! mhash-contexts (delq! entry mhash-contexts))))))) - -(define (remove-hmac-context-cleanup context) - (with-thread-mutex-lock mhash-contexts-mutex - (lambda () - (let ((entry (weak-assq context mhash-hmac-contexts))) - (if entry - (set! mhash-hmac-contexts (delq! entry mhash-hmac-contexts))))))) - -(define (weak-assq obj alist) - (let loop ((alist alist)) - (if (null? alist) #f - (let* ((entry (car alist)) - (key (weak-car entry))) - (if (eq? obj key) entry - (loop (cdr alist))))))) - -(define (cleanup-contexts) - (let loop ((entries mhash-contexts) - (prev #f)) - (if (pair? entries) - (let ((entry (car entries)) - (next (cdr entries))) - (if (weak-pair/car? entry) - (loop next entries) - (let ((context (weak-cdr entry))) - (if prev - (set-cdr! prev next) - (set! mhash-contexts next)) - (if (not (alien-null? context)) - (begin - (C-call "mhash_deinit" context 0) - (alien-null! context))) - (loop next prev))))))) - -(define (cleanup-hmac-contexts) - (let loop ((entries mhash-hmac-contexts) - (prev #f)) - (if (pair? entries) - (let ((entry (car entries)) - (next (cdr entries))) - (if (weak-pair/car? entry) - (loop next entries) - (let ((context (weak-cdr entry))) - (if prev - (set-cdr! prev next) - (set! mhash-hmac-contexts next)) - (if (not (alien-null? context)) - (begin - (C-call "mhash_hmac_deinit" context 0) - (alien-null! context))) - (loop next prev))))))) - -(define (cleanup-mhash-contexts) - (with-thread-mutex-try-lock - mhash-contexts-mutex - (lambda () - (cleanup-contexts) - (cleanup-hmac-contexts)) - (lambda () - unspecific))) - -(define (mhash-name->id name procedure) - (let ((n (vector-length mhash-algorithm-names))) - (let loop ((i 0)) - (cond ((fix:= i n) (error:bad-range-argument name procedure)) - ((eq? name (vector-ref mhash-algorithm-names i)) i) - (else (loop (fix:+ i 1))))))) - -(define-structure mhash-context mutex alien id) -(define-structure mhash-hmac-context mutex alien id) - -(define (guarantee-mhash-context object caller) - (if (not (mhash-context? object)) - (error:wrong-type-argument object "mhash context" caller)) - (if (alien-null? (mhash-context-alien object)) - (error:bad-range-argument object caller))) - -(define (guarantee-mhash-hmac-context object caller) - (if (not (mhash-hmac-context? object)) - (error:wrong-type-argument object "mhash HMAC context" caller)) - (if (alien-null? (mhash-hmac-context-alien object)) - (error:bad-range-argument object caller))) - -(define (guarantee-subbytevector object start end operator) - (guarantee bytevector? object operator) - (guarantee index-fixnum? start operator) - (guarantee index-fixnum? end operator) - (if (not (fix:<= start end)) - (error:bad-range-argument start operator)) - (if (not (fix:<= end (bytevector-length object))) - (error:bad-range-argument end operator))) - -(define (with-context-locked context thunk) - (with-thread-mutex-lock (mhash-context-mutex context) thunk)) - -(define (with-hmac-context-locked context thunk) - (with-thread-mutex-lock (mhash-hmac-context-mutex context) thunk)) - -(define (with-context-locked-open context operator receiver) - (with-thread-mutex-lock (mhash-context-mutex context) - (lambda () - (let ((alien (mhash-context-alien context))) - (if (alien-null? alien) - (error:bad-range-argument context operator)) - (receiver alien))))) - -(define (with-hmac-context-locked-open context operator receiver) - (with-thread-mutex-lock (mhash-hmac-context-mutex context) - (lambda () - (let ((alien (mhash-hmac-context-alien context))) - (if (alien-null? alien) - (error:bad-range-argument context operator)) - (receiver alien))))) - -(define (mhash-type-names) - (names-vector->list mhash-algorithm-names)) - -(define (mhash-get-block-size name) - (C-call "mhash_get_block_size" - (mhash-name->id name 'mhash-get-block-size))) - -(define (mhash-init name) - (let ((id (mhash-name->id name 'mhash-init)) - (alien (make-alien '|MHASH_INSTANCE|))) - (let ((context (make-mhash-context (make-thread-mutex) alien id))) - (add-context-cleanup context) - (with-context-locked context - (lambda () - (C-call "mhash_init" alien id) - (if (alien-null? alien) ; == MHASH_FAILED - (error "Unable to allocate mhash context:" name)))) - context))) - -(define (mhash-update context bytes start end) - (guarantee-subbytevector bytes start end 'mhash-update) - (with-context-locked-open context 'mhash-update - (lambda (alien) - (C-call "do_mhash" alien bytes start end)))) - -(define (mhash-end context) - (with-context-locked-open context 'mhash-end - (lambda (alien) - (let* ((id (mhash-context-id context)) - (size (C-call "mhash_get_block_size" id)) - (digest (make-bytevector size))) - (C-call "do_mhash_end" alien digest size) - (remove-context-cleanup context) - digest)))) - -(define (mhash-hmac-init name key) - (let ((id (mhash-name->id name 'mhash-hmac-init)) - (alien (make-alien '|MHASH_INSTANCE|))) - (let ((context (make-mhash-hmac-context (make-thread-mutex) alien id)) - (block-size (C-call "mhash_get_hash_pblock" id)) - (key-size (if (bytevector? key) - (bytevector-length key) - (string-length key)))) - (add-hmac-context-cleanup context) - (with-hmac-context-locked context - (lambda () - (C-call "mhash_hmac_init" alien id key key-size block-size) - (if (alien-null? alien) ; == MHASH_FAILED - (error "Unable to allocate mhash HMAC context:" name)))) - context))) - -(define (mhash-hmac-update context bytes start end) - (guarantee-mhash-hmac-context context 'mhash-hmac-update) - (guarantee-subbytevector bytes start end 'mhash-hmac-update) - (with-hmac-context-locked-open context 'mhash-hmac-update - (lambda (alien) - (C-call "do_mhash" alien bytes start end)))) - -(define (mhash-hmac-end context) - (with-hmac-context-locked-open context 'mhash-hmac-end - (lambda (alien) - (let* ((id (mhash-hmac-context-id context)) - (size (C-call "mhash_get_block_size" id)) - (digest (make-bytevector size))) - (C-call "do_mhash_hmac_end" alien digest size) - (remove-hmac-context-cleanup context) - digest)))) - -(define mhash-keygen-names) - -(define (keygen-name->id name caller) - (let ((n (vector-length mhash-keygen-names))) - (let loop ((i 0)) - (cond ((fix:= i n) (error:bad-range-argument name caller)) - ((eq? name (vector-ref mhash-keygen-names i)) i) - (else (loop (fix:+ i 1))))))) - -(define (mhash-keygen-type-names) - (names-vector->list mhash-keygen-names)) - -(define (mhash-keygen-uses-salt? name) - (not (zero? (C-call "mhash_keygen_uses_salt" - (keygen-name->id name 'mhash-keygen-uses-salt?))))) - -(define (mhash-keygen-uses-count? name) - (not (zero? (C-call "mhash_keygen_uses_count" - (keygen-name->id name 'mhash-keygen-uses-count?))))) - -(define (mhash-keygen-uses-hash-algorithm name) - (C-call "mhash_keygen_uses_hash_algorithm" - (keygen-name->id name 'mhash-keygen-uses-hash-algorithm))) - -(define (mhash-keygen-salt-size name) - (C-call "mhash_get_keygen_salt_size" - (keygen-name->id name 'mhash-keygen-salt-size))) - -(define (mhash-keygen-max-key-size name) - (C-call "mhash_get_keygen_max_key_size" - (keygen-name->id name 'mhash-keygen-max-key-size))) - -(define (mhash-keygen type passphrase #!optional salt) - (if (not (mhash-keygen-type? type)) - (error:wrong-type-argument type "mhash type" 'mhash-keygen)) - (let ((keygenid (mhash-keygen-type-id type)) - (keyword-size (mhash-keygen-type-key-length type)) - (passbytes (string->utf8 passphrase))) - (let ((params (salted-keygen-params - keygenid (mhash-keygen-type-parameter-vector type) salt)) - (keyword (make-bytevector keyword-size)) - (max-key-size (C-call "mhash_get_keygen_max_key_size" keygenid))) - - (define (hashid-map params i) - (let ((name (vector-ref params i))) - (if (not name) - 0 - (mhash-name->id name 'mhash-keygen)))) - - (if (not (or (zero? max-key-size) - (< max-key-size (bytevector-length keyword)))) - (error "keyword size exceeds maximum:" max-key-size type)) - (if (not (zero? (C-call "do_mhash_keygen" - keygenid - (hashid-map params 3) ;hash_algorithm[0] - (hashid-map params 4) ;hash_algorithm[1] - (vector-ref params 1) ;count - (vector-ref params 0) ;salt - (bytevector-length (vector-ref params 0)) - keyword keyword-size - passbytes (bytevector-length passbytes)))) - (error "Error signalled by mhash_keygen.")) - keyword))) - -(define (salted-keygen-params id params #!optional salt) - (if (not (zero? (C-call "mhash_keygen_uses_salt" id))) - (begin - (if (or (default-object? salt) (not salt)) - (error "Salt required:" - (vector-ref mhash-keygen-names id))) - (let ((n (C-call "mhash_get_keygen_salt_size" id))) - (if (not (or (= n 0) - (= n (bytevector-length salt)))) - (error "Salt size incorrect:" - (bytevector-length salt) - (error-irritant/noise "; should be:") - n))) - (let ((p (vector-copy params))) - (vector-set! p 0 salt) - p)) - params)) - -(define-structure (mhash-keygen-type (constructor %make-mhash-keygen-type)) - (id #f read-only #t) - (key-length #f read-only #t) - (parameter-vector #f read-only #t)) - -(define (make-mhash-keygen-type name key-length hash-names #!optional count) - (guarantee index-fixnum? key-length 'make-mhash-keygen-type) - (if (not (let ((m (mhash-keygen-max-key-size name))) - (or (= m 0) - (<= key-length m)))) - (error:bad-range-argument key-length 'make-mhash-keygen-type)) - (%make-mhash-keygen-type - (keygen-name->id name 'make-mhash-keygen-type) - key-length - (let ((n-algorithms (mhash-keygen-uses-hash-algorithm name)) - (hash-names - (if (list? hash-names) hash-names (list hash-names)))) - (let ((m (length hash-names))) - (if (not (= n-algorithms m)) - (error "Wrong number of hash types supplied:" - m - (error-irritant/noise "; should be:") - n-algorithms))) - (let ((n (+ 2 n-algorithms))) - (let ((v (make-vector n))) - (vector-set! v 0 #f) - (vector-set! - v 1 - (and (mhash-keygen-uses-count? name) - (begin - (if (or (default-object? count) (not count)) - (error "Iteration count required:" name)) - (if (not (and (exact-integer? count) - (positive? count))) - (error:bad-range-argument count 'make-mhash-keygen-type)) - count))) - (do ((i 2 (fix:+ i 1)) - (names hash-names (cdr names))) - ((fix:= i n)) - (vector-set! v i - (mhash-name->id (car names) 'make-mhash-keygen-type))) - v))))) - -(define (initialize-mhash-variables!) - (set! mhash-algorithm-names - (make-names-vector - (lambda () (C-call "mhash_count")) - (lambda (hashid) - (let* ((alien (make-alien-to-free - '(* char) - (lambda (alien) - (C-call "mhash_get_hash_name" - alien hashid)))) - (string (and (not (alien-null? alien)) - (c-peek-cstring alien)))) - (free alien) - string)))) - (set! mhash-keygen-names - (make-names-vector - (lambda () (C-call "mhash_keygen_count")) - (lambda (keygenid) - (let* ((alien (make-alien-to-free - '(* char) - (lambda (alien) - (C-call "mhash_get_keygen_name" - alien keygenid)))) - (string (and (not (alien-null? alien)) - (c-peek-cstring alien)))) - (free alien) - string))))) - -(define (reset-mhash-variables!) - (for-each (lambda (weak) (alien-null! (weak-cdr weak))) mhash-contexts) - (set! mhash-contexts '()) - (for-each (lambda (weak) (alien-null! (weak-cdr weak))) mhash-hmac-contexts) - (set! mhash-hmac-contexts '()) - (initialize-mhash-variables!) - unspecific) - -(define (mhash-file hash-type filename) - (call-with-binary-input-file filename - (port-consumer (lambda () (mhash-init hash-type)) - mhash-update - mhash-end))) - -(define (mhash-string hash-type string #!optional start end) - (mhash-bytevector hash-type (string->utf8 string start end))) - -(define (mhash-bytevector hash-type bytes #!optional start end) - (let* ((end (fix:end-index end (bytevector-length bytes) 'mhash-bytevector)) - (start (fix:start-index start end 'mhash-bytevector)) - (context (mhash-init hash-type))) - (mhash-update context bytes start end) - (mhash-end context))) - -(define (port-consumer initialize update finalize) - (lambda (port) - (call-with-buffer #x1000 - (lambda (buffer) - (let ((context (initialize))) - (let loop () - (let ((n (read-bytevector! buffer port))) - (if (and n (not (eof-object? n))) - (begin - (update context buffer 0 n) - (loop))))) - (finalize context)))))) - -(define (call-with-buffer n procedure) - (let ((buffer (make-bytevector n))) - (dynamic-wind - (lambda () - unspecific) - (lambda () - (procedure buffer)) - (lambda () - (bytevector-fill! buffer 0))))) - -;;;; Package initialization - -(define (initialize-package!) - (set! mhash-contexts-mutex (make-thread-mutex)) - (reset-mhash-variables!) - (add-gc-daemon! cleanup-mhash-contexts) - (add-event-receiver! event:after-restart reset-mhash-variables!)) - -(define (make-names-vector get-count get-name) - (let ((n (get-count))) - (let ((v (make-vector n))) - (do ((i 0 (fix:+ i 1))) - ((fix:= i n)) - (vector-set! v i - (let ((name (get-name i))) - (and name - (intern name))))) - v))) - -(define (names-vector->list v) - (let ((end (vector-length v))) - (let loop ((index 0) (names '())) - (if (fix:< index end) - (loop (fix:+ index 1) - (let ((name (vector-ref v index))) - (if name - (cons name names) - names))) - names)))) \ No newline at end of file diff --git a/src/mhash/optiondb.scm b/src/mhash/optiondb.scm deleted file mode 100644 index 61bacdc40..000000000 --- a/src/mhash/optiondb.scm +++ /dev/null @@ -1,10 +0,0 @@ -#| -*-Scheme-*- |# - -(define-load-option 'MHASH - (standard-system-loader ".")) - -(further-load-options - (named-lambda (system-load-options) - (merge-pathnames "optiondb" - (cadr (access library-directory-path - (->environment '(runtime pathname))))))) \ No newline at end of file diff --git a/src/mhash/tags-fix.sh b/src/mhash/tags-fix.sh deleted file mode 100755 index a22e6bab5..000000000 --- a/src/mhash/tags-fix.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -*-Scheme-*- -# -# Chop the generated $1-shim.c and $1-const.c files out of TAGS. - -set -e -: ${MIT_SCHEME_EXE=mit-scheme} -${MIT_SCHEME_EXE} --batch-mode -- ${1+"$@"} <<\EOF -(let ((name (car (command-line-arguments)))) - (let ((shim.c-prefix (string-append name "-shim.c,")) - (const.c-prefix (string-append name "-const.c,"))) - - (define (rewriter in out) - (let loop ((skipping? #f)) - (let ((line (read-line in))) - (cond ((eof-object? line) - unspecific) - ((string=? line "\f") - (let ((next (read-line in))) - (cond ((eof-object? next) (error "Bogus TAGS format:" next)) - ((or (string-prefix? shim.c-prefix next) - (string-prefix? const.c-prefix next)) - (loop #t)) - (else - (write-string line out) - (newline out) - (write-string next out) - (newline out) - (loop #f))))) - (skipping? - (loop skipping?)) - (else - (write-string line out) - (newline out) - (loop skipping?)))))) - - (parameterize ((param:suppress-loading-message? #t)) - (load-option 'FFI)) - ((access rewrite-file (->environment '(ffi build))) - (merge-pathnames "TAGS") - rewriter))) -EOF