rpms
/
crypto-utils
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix build (#1431612) 

fix Perl autoreqs (#1413917)
Resolves: rhbz#1431612
Resolves: rhbz#1413917
This commit is contained in:
Joe Orton 2017-07-06 16:27:20 +01:00
parent 3453724c94
commit 7968540314
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
certext.c
View File

@ -258,8 +258,8 @@ Gets_s(char *buff, size_t size) {
static SECStatus
PrintChoicesAndGetAnswer(char* str, char* rBuff, int rSize)
{
fprintf(stdout, str);
fprintf(stdout, " > ");
fputs(str, stdout);
fputs(" > ", stdout);
fflush (stdout);
if (Gets_s(rBuff, rSize) == NULL) {
PORT_SetError(SEC_ERROR_INPUT_LEN);

7
crypto-utils.spec
View File

@ -4,7 +4,7 @@
Summary: SSL certificate and key management utilities
Name: crypto-utils
Version: 2.4.1
Release: 66%{?dist}
Release: 67%{?dist}
Group: Applications/System
# certwatch.c is GPLv2
# pemutil.c etc are (MPLv1.1+ or GPLv2+ or LPGLv2+)
@ -122,6 +122,7 @@ sed -e "s|^\$bindir.*$|\$bindir = \"%{_bindir}\";|" \
-e "s/'Challenge',/'Email','Challenge',/g" \
-e "/@EXTRA@/d" \
< %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/genkey
chmod 755 $RPM_BUILD_ROOT%{_bindir}/genkey
chmod -R u+w $RPM_BUILD_ROOT
@ -135,6 +136,10 @@ chmod -R u+w $RPM_BUILD_ROOT
%{perl_vendorarch}/auto/Crypt
%changelog
* Thu Jul 6 2017 Joe Orton <jorton@redhat.com> - 2.4.1-67
- fix build (#1431612)
- fix Perl autoreqs (#1413917)
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.1-66
- Perl 5.26 rebuild

34
keyutil.c
View File

@ -956,19 +956,19 @@ UpdateRNG(void)
char meter[] = {
"\r| |" };
#define FPS fprintf(stderr,
FPS "\n");
FPS "A random seed must be generated that will be used in the\n");
FPS "creation of your key. One of the easiest ways to create a\n");
FPS "random seed is to use the timing of keystrokes on a keyboard.\n");
FPS "\n");
FPS "To begin, type keys on the keyboard until this progress meter\n");
FPS "is full. DO NOT USE THE AUTOREPEAT FUNCTION ON YOUR KEYBOARD!\n");
FPS "\n");
FPS "\n");
FPS "Continue typing until the progress meter is full:\n\n");
FPS meter);
FPS "\r|");
#define FPS(s_) fputs(s_, stderr)
FPS("\n");
FPS("A random seed must be generated that will be used in the\n");
FPS("creation of your key. One of the easiest ways to create a\n");
FPS("random seed is to use the timing of keystrokes on a keyboard.\n");
FPS("\n");
FPS("To begin, type keys on the keyboard until this progress meter\n");
FPS("is full. DO NOT USE THE AUTOREPEAT FUNCTION ON YOUR KEYBOARD!\n");
FPS("\n");
FPS("\n");
FPS("Continue typing until the progress meter is full:\n\n");
FPS(meter);
FPS("\r|");
/* turn off echo on stdin & return on 1 char instead of NL */
fd = fileno(stdin);
@ -994,20 +994,20 @@ UpdateRNG(void)
randbuf[count] = c;
if (count == 0 || c != randbuf[count-1]) {
count++;
FPS "*");
FPS("*");
}
}
PK11_RandomUpdate(randbuf, sizeof randbuf);
memset(randbuf, 0, sizeof randbuf);
FPS "\n\n");
FPS "Finished. Press enter to continue: ");
FPS("\n\n");
FPS("Finished. Press enter to continue: ");
while ((c = getc(stdin)) != '\n' && c != EOF)
;
if (c == EOF)
rv = -1;
FPS "\n");
FPS("\n");
#undef FPS