fix build (#1431612)
fix Perl autoreqs (#1413917) Resolves: rhbz#1431612 Resolves: rhbz#1413917
This commit is contained in:
parent
3453724c94
commit
7968540314
@ -258,8 +258,8 @@ Gets_s(char *buff, size_t size) {
|
|||||||
static SECStatus
|
static SECStatus
|
||||||
PrintChoicesAndGetAnswer(char* str, char* rBuff, int rSize)
|
PrintChoicesAndGetAnswer(char* str, char* rBuff, int rSize)
|
||||||
{
|
{
|
||||||
fprintf(stdout, str);
|
fputs(str, stdout);
|
||||||
fprintf(stdout, " > ");
|
fputs(" > ", stdout);
|
||||||
fflush (stdout);
|
fflush (stdout);
|
||||||
if (Gets_s(rBuff, rSize) == NULL) {
|
if (Gets_s(rBuff, rSize) == NULL) {
|
||||||
PORT_SetError(SEC_ERROR_INPUT_LEN);
|
PORT_SetError(SEC_ERROR_INPUT_LEN);
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
Summary: SSL certificate and key management utilities
|
Summary: SSL certificate and key management utilities
|
||||||
Name: crypto-utils
|
Name: crypto-utils
|
||||||
Version: 2.4.1
|
Version: 2.4.1
|
||||||
Release: 66%{?dist}
|
Release: 67%{?dist}
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
# certwatch.c is GPLv2
|
# certwatch.c is GPLv2
|
||||||
# pemutil.c etc are (MPLv1.1+ or GPLv2+ or LPGLv2+)
|
# 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 "s/'Challenge',/'Email','Challenge',/g" \
|
||||||
-e "/@EXTRA@/d" \
|
-e "/@EXTRA@/d" \
|
||||||
< %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/genkey
|
< %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/genkey
|
||||||
|
chmod 755 $RPM_BUILD_ROOT%{_bindir}/genkey
|
||||||
|
|
||||||
chmod -R u+w $RPM_BUILD_ROOT
|
chmod -R u+w $RPM_BUILD_ROOT
|
||||||
|
|
||||||
@ -135,6 +136,10 @@ chmod -R u+w $RPM_BUILD_ROOT
|
|||||||
%{perl_vendorarch}/auto/Crypt
|
%{perl_vendorarch}/auto/Crypt
|
||||||
|
|
||||||
%changelog
|
%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
|
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.1-66
|
||||||
- Perl 5.26 rebuild
|
- Perl 5.26 rebuild
|
||||||
|
|
||||||
|
34
keyutil.c
34
keyutil.c
@ -956,19 +956,19 @@ UpdateRNG(void)
|
|||||||
char meter[] = {
|
char meter[] = {
|
||||||
"\r| |" };
|
"\r| |" };
|
||||||
|
|
||||||
#define FPS fprintf(stderr,
|
#define FPS(s_) fputs(s_, stderr)
|
||||||
FPS "\n");
|
FPS("\n");
|
||||||
FPS "A random seed must be generated that will be used in the\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("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("random seed is to use the timing of keystrokes on a keyboard.\n");
|
||||||
FPS "\n");
|
FPS("\n");
|
||||||
FPS "To begin, type keys on the keyboard until this progress meter\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("is full. DO NOT USE THE AUTOREPEAT FUNCTION ON YOUR KEYBOARD!\n");
|
||||||
FPS "\n");
|
FPS("\n");
|
||||||
FPS "\n");
|
FPS("\n");
|
||||||
FPS "Continue typing until the progress meter is full:\n\n");
|
FPS("Continue typing until the progress meter is full:\n\n");
|
||||||
FPS meter);
|
FPS(meter);
|
||||||
FPS "\r|");
|
FPS("\r|");
|
||||||
|
|
||||||
/* turn off echo on stdin & return on 1 char instead of NL */
|
/* turn off echo on stdin & return on 1 char instead of NL */
|
||||||
fd = fileno(stdin);
|
fd = fileno(stdin);
|
||||||
@ -994,20 +994,20 @@ UpdateRNG(void)
|
|||||||
randbuf[count] = c;
|
randbuf[count] = c;
|
||||||
if (count == 0 || c != randbuf[count-1]) {
|
if (count == 0 || c != randbuf[count-1]) {
|
||||||
count++;
|
count++;
|
||||||
FPS "*");
|
FPS("*");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PK11_RandomUpdate(randbuf, sizeof randbuf);
|
PK11_RandomUpdate(randbuf, sizeof randbuf);
|
||||||
memset(randbuf, 0, sizeof randbuf);
|
memset(randbuf, 0, sizeof randbuf);
|
||||||
|
|
||||||
FPS "\n\n");
|
FPS("\n\n");
|
||||||
FPS "Finished. Press enter to continue: ");
|
FPS("Finished. Press enter to continue: ");
|
||||||
|
|
||||||
while ((c = getc(stdin)) != '\n' && c != EOF)
|
while ((c = getc(stdin)) != '\n' && c != EOF)
|
||||||
;
|
;
|
||||||
if (c == EOF)
|
if (c == EOF)
|
||||||
rv = -1;
|
rv = -1;
|
||||||
FPS "\n");
|
FPS("\n");
|
||||||
|
|
||||||
#undef FPS
|
#undef FPS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user