Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for yescrypt implementation. #4

Closed
wants to merge 4 commits into from
Closed

Fixes for yescrypt implementation. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01a94e7
Update copyright date to 2021.
besser82 Jun 15, 2021
a7395ea
customize: The definition of `password_crypto` must match the mli file.
besser82 Jun 15, 2021
b54f59f
po: Fix Makefile for ocaml-gettext.
besser82 Jun 15, 2021
3aa029d
po: Update pot file.
besser82 Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion customize/password.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ open Common_gettext.Gettext

open Printf

type password_crypto = [`MD5 | `SHA256 | `SHA512 | `YESCRYPT ]
type password_crypto = [ `MD5 | `SHA256 | `SHA512 | `YESCRYPT ]

type password_selector = {
pw_password : password;
Expand Down
4 changes: 2 additions & 2 deletions customize/password.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(* virt-sysprep
* Copyright (C) 2012-2020 Red Hat Inc.
* Copyright (C) 2012-2021 Red Hat Inc.
*
* 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
Expand All @@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)

type password_crypto = [ `MD5 | `SHA256 | `SHA512 ]
type password_crypto = [ `MD5 | `SHA256 | `SHA512 | `YESCRYPT ]

val password_crypto_of_string : string -> password_crypto
(** Parse --password-crypto parameter on command line. *)
Expand Down
4 changes: 2 additions & 2 deletions po/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# libguestfs
# Copyright (C) 2009-2020 Red Hat Inc.
# Copyright (C) 2009-2021 Red Hat Inc.
#
# 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
Expand Down Expand Up @@ -64,7 +64,7 @@ FIX_CHARSET = \
$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl $(POTFILES_PL) POTFILES-ml $(POTFILES_ML)
rm -f $@-t
touch $@-t
if HAVE_OCAML_GETTEXT
if HAVE_OCAML_PKG_GETTEXT
cd $(top_srcdir) && $(OCAML_GETTEXT) --action extract --extract-pot $(abs_srcdir)/$@-t $(shell cat $(abs_srcdir)/POTFILES-ml)
\
$(FIX_CHARSET) $@-t
Expand Down
13 changes: 7 additions & 6 deletions po/guestfs-tools.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: guestfs-tools 1.47.1\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
"POT-Creation-Date: 2021-05-17 15:25+0100\n"
"POT-Creation-Date: 2021-06-15 23:14+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -1915,7 +1915,7 @@ msgstr ""
msgid "Setting passwords"
msgstr ""

#: customize/password.ml:110
#: customize/password.ml:111
msgid "Setting random password of %s to %s"
msgstr ""

Expand Down Expand Up @@ -2670,7 +2670,7 @@ msgstr ""
msgid "invalid output stream for --machine-readable: %s"
msgstr ""

#: customize/password.ml:71
#: customize/password.ml:72
msgid "invalid password selector ‘%s’; see the man page"
msgstr ""

Expand Down Expand Up @@ -2852,12 +2852,13 @@ msgstr ""
msgid "part=size"
msgstr ""

#: customize/password.ml:50
#: customize/password.ml:51
msgid ""
"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" "
"or \"yescrypt\""
msgstr ""

#: customize/password.ml:172
#: customize/password.ml:192
msgid ""
"password: using insecure md5 password encryption for guest of type %s "
"version %d.%d.\n"
Expand Down