author | jenny.yung@oracle.com <jenny.yung@oracle.com> |
Tue, 16 Jun 2015 10:14:56 -0700 | |
branch | s11-update |
changeset 4489 | 2713cbca9e1e |
parent 3027 | 3bcf7d43558b |
child 5841 | 97e8c4dc6a82 |
permissions | -rw-r--r-- |
3027
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
1 |
Developed in-house, not fed back - can't submit new issue |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
2 |
- community seems dead. |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
3 |
Solaris specific: uses internal implementation of SHA1 |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
4 |
|
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
5 |
--- pwgen-2.06/sha1num.c 2013-11-25 12:09:31.359377740 -0800 |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
6 |
+++ pwgen-2.06/sha1num.c 2013-11-25 12:09:26.489379943 -0800 |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
7 |
@@ -11,7 +11,16 @@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
8 |
#include <stdio.h> |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
9 |
#include <stdlib.h> |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
10 |
#include "pwgen.h" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
11 |
+#ifdef SHA_INTERNAL |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
12 |
#include "sha1.h" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
13 |
+#endif |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
14 |
+#ifdef SHA_SOLARIS |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
15 |
+#include <sha1.h> |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
16 |
+#define sha1_context SHA1_CTX |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
17 |
+#define sha1_starts SHA1Init |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
18 |
+#define sha1_update SHA1Update |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
19 |
+#define sha1_finish(a,b) SHA1Final(b,a) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
20 |
+#endif |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
21 |
|
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
22 |
sha1_context sha1_ctx; |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
23 |
char *sha1_seed; |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
24 |
--- pwgen-2.06/configure.in 2013-12-02 02:57:12.022589524 -0800 |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
25 |
+++ pwgen-2.06/configure.in 2013-12-02 02:56:10.404769485 -0800 |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
26 |
@@ -8,4 +8,23 @@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
27 |
AC_PATH_PROG(PERL, perl, perl) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
28 |
AC_CHECK_FUNCS(drand48 getopt_long) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
29 |
AC_CHECK_HEADERS(getopt.h) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
30 |
+pwgen_sha="internal" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
31 |
+SHA_OBJ="" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
32 |
+SHA_SRC="" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
33 |
+SHA_LIB="" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
34 |
+SHA_HEAD="" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
35 |
+AC_CHECK_LIB(md, SHA1Init, [pwgen_sha="solaris"]) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
36 |
+if test x"$pwgen_sha" = x"internal" ; then |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
37 |
+ CFLAGS="${CFLAGS} -DSHA_INTERNAL" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
38 |
+ SHA_OBJ="sha1.o" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
39 |
+ SHA_SRC="sha1.c" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
40 |
+ SHA_HEAD="sha1.h" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
41 |
+elif test x"$pwgen_sha" = x"solaris" ; then |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
42 |
+ SHA_LIB="-lmd" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
43 |
+ CFLAGS="${CFLAGS} -DSHA_SOLARIS" |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
44 |
+fi |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
45 |
+AC_SUBST(SHA_OBJ) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
46 |
+AC_SUBST(SHA_SRC) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
47 |
+AC_SUBST(SHA_LIB) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
48 |
+AC_SUBST(SHA_HEAD) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
49 |
AC_OUTPUT(Makefile) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
50 |
--- pwgen-2.06/Makefile.in 2013-12-02 03:52:49.960581781 -0800 |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
51 |
+++ pwgen-2.06/Makefile.in 2013-12-02 03:52:25.323489891 -0800 |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
52 |
@@ -19,7 +19,7 @@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
53 |
CFLAGS = @CFLAGS@ $(WALL_OPTS) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
54 |
CPPFLAGS = @CPPFLAGS@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
55 |
ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
56 |
-LDFLAGS = @LDFLAGS@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
57 |
+LDFLAGS = @LDFLAGS@ @SHA_LIB@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
58 |
RM = @RM@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
59 |
MV = @MV@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
60 |
SED = @SED@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
61 |
@@ -31,9 +31,9 @@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
62 |
.c.o: |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
63 |
$(CC) -c $(ALL_CFLAGS) $< -o $@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
64 |
|
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
65 |
-OBJS= pwgen.o pw_phonemes.o pw_rand.o randnum.o sha1.o sha1num.o |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
66 |
+OBJS= pwgen.o pw_phonemes.o pw_rand.o randnum.o @SHA_OBJ@ sha1num.o |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
67 |
|
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
68 |
-SRCS= pwgen.c pw_phonemes.c pw_rand.c randnum.c sha1.c sha1num.c |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
69 |
+SRCS= pwgen.c pw_phonemes.c pw_rand.c randnum.c @SHA_SRC@ sha1num.c |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
70 |
|
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
71 |
|
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
72 |
pwgen: $(OBJS) |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
73 |
@@ -127,4 +127,4 @@ |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
74 |
pw_rand.o: pw_rand.c pwgen.h |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
75 |
randnum.o: randnum.c pwgen.h |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
76 |
sha1.o: sha1.c sha1.h |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
77 |
-sha1num.o: sha1num.c sha1.h pwgen.h |
3bcf7d43558b
17636356 problem in UTILITY/PWGEN
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff
changeset
|
78 |
+sha1num.o: sha1num.c @SHA_HEAD@ pwgen.h |