author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Fri, 07 Apr 2017 17:56:36 -0700 | |
changeset 7851 | f82a18f72950 |
parent 5841 | 97e8c4dc6a82 |
permissions | -rw-r--r-- |
5841
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
1 |
Developed in-house, as the community seems to be back it can be |
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
2 |
provided back upstream. |
1600
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
3 |
|
5841
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
4 |
Makes pwgen to use Solaris' implementation of SHA1. |
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
5 |
|
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
6 |
--- pwgen-2.07/configure.in.orig Fri Apr 22 04:49:40 2016 |
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
7 |
+++ pwgen-2.07/configure.in Fri Apr 22 04:52:17 2016 |
1600
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
8 |
@@ -8,4 +8,23 @@ |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
9 |
AC_PATH_PROG(PERL, perl, perl) |
5841
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
10 |
AC_CHECK_FUNCS(getopt_long) |
1600
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
11 |
AC_CHECK_HEADERS(getopt.h) |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
12 |
+pwgen_sha="internal" |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
13 |
+SHA_OBJ="" |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
14 |
+SHA_SRC="" |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
15 |
+SHA_LIB="" |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
16 |
+SHA_HEAD="" |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
17 |
+AC_CHECK_LIB(md, SHA1Init, [pwgen_sha="solaris"]) |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
18 |
+if test x"$pwgen_sha" = x"internal" ; then |
5841
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
19 |
+ CFLAGS="${CFLAGS} -DSHA_INTERNAL" |
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
20 |
+ SHA_OBJ="sha1.o" |
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
21 |
+ SHA_SRC="sha1.c" |
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
22 |
+ SHA_HEAD="sha1.h" |
1600
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
23 |
+elif test x"$pwgen_sha" = x"solaris" ; then |
5841
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
24 |
+ SHA_LIB="-lmd" |
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
25 |
+ CFLAGS="${CFLAGS} -DSHA_SOLARIS" |
1600
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
26 |
+fi |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
27 |
+AC_SUBST(SHA_OBJ) |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
28 |
+AC_SUBST(SHA_SRC) |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
29 |
+AC_SUBST(SHA_LIB) |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
30 |
+AC_SUBST(SHA_HEAD) |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
31 |
AC_OUTPUT(Makefile) |
5841
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
32 |
--- pwgen-2.07/Makefile.in.orig Fri Apr 22 04:52:43 2016 |
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
33 |
+++ pwgen-2.07/Makefile.in Fri Apr 22 04:56:18 2016 |
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
34 |
@@ -20,7 +20,7 @@ |
1600
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
35 |
CFLAGS = @CFLAGS@ $(WALL_OPTS) |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
36 |
CPPFLAGS = @CPPFLAGS@ |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
37 |
ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
38 |
-LDFLAGS = @LDFLAGS@ |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
39 |
+LDFLAGS = @LDFLAGS@ @SHA_LIB@ |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
40 |
RM = @RM@ |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
41 |
MV = @MV@ |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
42 |
SED = @SED@ |
5841
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
43 |
@@ -32,9 +32,9 @@ |
1600
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
44 |
.c.o: |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
45 |
$(CC) -c $(ALL_CFLAGS) $< -o $@ |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
46 |
|
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
47 |
-OBJS= pwgen.o pw_phonemes.o pw_rand.o randnum.o sha1.o sha1num.o |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
48 |
+OBJS= pwgen.o pw_phonemes.o pw_rand.o randnum.o @SHA_OBJ@ sha1num.o |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
49 |
|
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
50 |
-SRCS= pwgen.c pw_phonemes.c pw_rand.c randnum.c sha1.c sha1num.c |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
51 |
+SRCS= pwgen.c pw_phonemes.c pw_rand.c randnum.c @SHA_SRC@ sha1num.c |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
52 |
|
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
53 |
|
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
54 |
pwgen: $(OBJS) |
5841
97e8c4dc6a82
22907390 Upgrade pwgen to version 2.07
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
1600
diff
changeset
|
55 |
@@ -128,4 +128,4 @@ |
1600
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
56 |
pw_rand.o: pw_rand.c pwgen.h |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
57 |
randnum.o: randnum.c pwgen.h |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
58 |
sha1.o: sha1.c sha1.h |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
59 |
-sha1num.o: sha1num.c sha1.h pwgen.h |
936fff797203
17454821 pwgen shall use existing approved library for SHA-1
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
60 |
+sha1num.o: sha1num.c @SHA_HEAD@ pwgen.h |