Recent changes from HEAD

17 files changed, 45 insertions, 30 deletions

diff --git a/CHANGES b/CHANGES
index 0de34cc486..7c6eb2dd67 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,23 @@
      functions operate on a caller-supplied key-structure and return
      success/failure rather than returning a key or NULL - this is to
      help make "keygen" another member function of RSA_METHOD etc.
+
+     Example for using the new callback interface:
+
+          int (*my_callback)(int a, int b, BN_GENCB *cb) = ...;
+          void *my_arg = ...;
+          BN_GENCB my_cb;
+
+          BN_GENCB_set(&my_cb, my_callback, my_arg);
+
+          return BN_is_prime_ex(some_bignum, BN_prime_checks, NULL, &cb);
+          /* For the meaning of a, b in calls to my_callback(), see the
+           * documentation of the function that calls the callback.
+           * cb will point to my_cb; my_arg can be retrieved as cb->arg.
+           * my_callback should return 1 if it wants BN_is_prime_ex()
+           * to continue, or 0 to stop.
+           */
+
      [Geoff Thorpe]
 
   *) Change the ZLIB compression method to be stateful, and make it
@@ -25,9 +42,9 @@
      is defined as follows (according to X.509_4thEditionDraftV6.pdf):
 
      CertificatePair ::= SEQUENCE {
-	forward		[0]	Certificate OPTIONAL,
-	reverse		[1]	Certificate OPTIONAL,
-	-- at least one of the pair shall be present -- }
+        forward		[0]	Certificate OPTIONAL,
+        reverse		[1]	Certificate OPTIONAL,
+        -- at least one of the pair shall be present -- }
 
      Also implement the PEM functions to read and write certificate
      pairs, and defined the PEM tag as "CERTIFICATE PAIR".
diff --git a/Configure b/Configure
index 3e22a460af..451330a0b4 100755
--- a/Configure
+++ b/Configure
@@ -1613,7 +1613,8 @@ You gave the option 'shared'.  Normally, that would give you shared libraries.
 Unfortunately, the OpenSSL configuration doesn't include shared library support
 for this platform yet, so it will pretend you gave the option 'no-shared'.  If
 you can inform the developpers (openssl-dev\@openssl.org) how to support shared
-libraries on this platform, they will at least look at it and try their best.
+libraries on this platform, they will at least look at it and try their best
+(but please first make sure you have tried with a current version of OpenSSL).
 EOF
 
 exit(0);
diff --git a/Makefile.org b/Makefile.org
index 4e72e43c46..3568efc314 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -373,8 +373,7 @@ rehash.time: certs
 	@(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \
 		export OPENSSL OPENSSL_DEBUG_MEMORY; \
 		LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \
-		if [ "$(PLATFORM)" = "DJGPP" ]; then PATH="`pwd`\;$$PATH";  \
-		elif [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
+		if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
 		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
 		$(PERL) tools/c_rehash certs)
 	touch rehash.time
@@ -385,8 +384,7 @@ tests: rehash
 	@(cd test && echo "testing..." && \
 	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
 	@LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \
-		if [ "$(PLATFORM)" = "DJGPP" ]; then PATH="`pwd`\;$$PATH";  \
-		elif [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
+		if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
 		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
 		apps/openssl version -a
 
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 9d7546bac1..ab266f19b3 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -150,8 +150,7 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
 	fi
 	-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; \
 		LIBPATH="`pwd`"; LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; \
-		if [ "$(PLATFORM)" = "DJGPP" ]; then PATH="`pwd`\;$$PATH";  \
-		elif [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
+		if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
 		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
 		$(PERL) tools/c_rehash certs)
 
diff --git a/config b/config
index 6199d170e0..fe8a441b28 100755
--- a/config
+++ b/config
@@ -550,7 +550,7 @@ EOF
   ppc-apple-darwin*) OUT="darwin-ppc-cc" ;;
   i386-apple-darwin*) OUT="darwin-i386-cc" ;;
   sparc64-*-linux2)
-	echo "WARNING! If *know* that your GNU C supports 64-bit/V9 ABI"
+	echo "WARNING! If you *know* that your GNU C supports 64-bit/V9 ABI"
 	echo "         and wish to build 64-bit library, then you have to"
 	echo "         invoke './Configure linux64-sparcv9' *manually*."
 	if [ "$TEST" = "false" ]; then
diff --git a/crypto/md4/md4.c b/crypto/md4/md4.c
index 2ac2d914ff..141415ad4d 100644
--- a/crypto/md4/md4.c
+++ b/crypto/md4/md4.c
@@ -64,7 +64,7 @@
 
 void do_fp(FILE *f);
 void pt(unsigned char *md);
-#ifndef _OSD_POSIX
+#if !defined(_OSD_POSIX) && !defined(__DJGPP__)
 int read(int, void *, unsigned int);
 #endif
 
diff --git a/crypto/md5/md5.c b/crypto/md5/md5.c
index 7ed0024ae1..563733abc5 100644
--- a/crypto/md5/md5.c
+++ b/crypto/md5/md5.c
@@ -64,7 +64,7 @@
 
 void do_fp(FILE *f);
 void pt(unsigned char *md);
-#ifndef _OSD_POSIX
+#if !defined(_OSD_POSIX) && !defined(__DJGPP__)
 int read(int, void *, unsigned int);
 #endif
 
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index e4c4c48669..56e6d87422 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -897,7 +897,7 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"RC4-40","rc4-40",NID_rc4_40,0,NULL},
 {"RC2-40-CBC","rc2-40-cbc",NID_rc2_40_cbc,0,NULL},
 {"GN","givenName",NID_givenName,3,&(lvalues[535]),0},
-{"SN","surName",NID_surname,3,&(lvalues[538]),0},
+{"SN","surname",NID_surname,3,&(lvalues[538]),0},
 {"initials","initials",NID_initials,3,&(lvalues[541]),0},
 {NULL,NULL,NID_undef,0,NULL},
 {"crlDistributionPoints","X509v3 CRL Distribution Points",
@@ -3282,7 +3282,7 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[16]),/* "stateOrProvinceName" */
 &(nid_objs[498]),/* "subtreeMaximumQuality" */
 &(nid_objs[497]),/* "subtreeMinimumQuality" */
-&(nid_objs[100]),/* "surName" */
+&(nid_objs[100]),/* "surname" */
 &(nid_objs[459]),/* "textEncodedORAddress" */
 &(nid_objs[293]),/* "textNotice" */
 &(nid_objs[106]),/* "title" */
diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index bd5a4e1fef..990e18113a 100644
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -1880,7 +1880,7 @@
 #define OBJ_commonName		OBJ_X509,3L
 
 #define SN_surname		"SN"
-#define LN_surname		"surName"
+#define LN_surname		"surname"
 #define NID_surname		100
 #define OBJ_surname		OBJ_X509,4L
 
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 8c204be2dd..e13912e7a8 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -610,8 +610,7 @@ algorithm 29		: RSA-SHA1-2		: sha1WithRSA
 
 X500 4			: X509
 X509 3			: CN			: commonName
-!Cname surname
-X509 4			: SN			: surName
+X509 4			: SN			: surname
 X509 5			: 			: serialNumber
 X509 6			: C			: countryName
 X509 7			: L			: localityName
diff --git a/crypto/ripemd/rmd160.c b/crypto/ripemd/rmd160.c
index 4f8b88a18a..b0ec574498 100644
--- a/crypto/ripemd/rmd160.c
+++ b/crypto/ripemd/rmd160.c
@@ -64,7 +64,7 @@
 
 void do_fp(FILE *f);
 void pt(unsigned char *md);
-#ifndef _OSD_POSIX
+#if !defined(_OSD_POSIX) && !defined(__DJGPP__)
 int read(int, void *, unsigned int);
 #endif
 
diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index 1dad878ff6..13e5f20dcb 100644
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c
@@ -237,7 +237,7 @@ static int general_allocate_boolean(UI *ui,
 	return ret;
 	}
 
-/* Returns the index to the place in the stack or 0 for error.  Uses a
+/* Returns the index to the place in the stack or -1 for error.  Uses a
    direct reference to the prompt.  */
 int UI_add_input_string(UI *ui, const char *prompt, int flags,
 	char *result_buf, int minsize, int maxsize)
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 2f92344604..902ee4b767 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -557,7 +557,7 @@ static int echo_console(UI *ui)
 
 static int close_console(UI *ui)
 	{
-	if (tty_in != stderr) fclose(tty_in);
+	if (tty_in != stdin) fclose(tty_in);
 	if (tty_out != stderr) fclose(tty_out);
 #ifdef OPENSSL_SYS_VMS
 	status = sys$dassgn(channel);
diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c
index ee9730d5e2..46bc8c1a9a 100644
--- a/crypto/ui/ui_util.c
+++ b/crypto/ui/ui_util.c
@@ -78,12 +78,14 @@ int UI_UTIL_read_pw(char *buf,char *buff,int size,const char *prompt,int verify)
 	if (ui)
 		{
 		ok = UI_add_input_string(ui,prompt,0,buf,0,size-1);
-		if (ok == 0 && verify)
+		if (ok >= 0 && verify)
 			ok = UI_add_verify_string(ui,prompt,0,buff,0,size-1,
 				buf);
-		if (ok == 0)
+		if (ok >= 0)
 			ok=UI_process(ui);
 		UI_free(ui);
 		}
+	if (ok > 0)
+		ok = 0;
 	return(ok);
 	}
diff --git a/doc/crypto/BN_generate_prime.pod b/doc/crypto/BN_generate_prime.pod
index 6ea23791d1..7dccacbc1e 100644
--- a/doc/crypto/BN_generate_prime.pod
+++ b/doc/crypto/BN_generate_prime.pod
@@ -70,7 +70,7 @@ If B<do_trial_division == 0>, this test is skipped.
 
 Both BN_is_prime() and BN_is_prime_fasttest() perform a Miller-Rabin
 probabilistic primality test with B<checks> iterations. If
-B<checks == BN_prime_check>, a number of iterations is used that
+B<checks == BN_prime_checks>, a number of iterations is used that
 yields a false positive rate of at most 2^-80 for random input.
 
 If B<callback> is not B<NULL>, B<callback(1, j, cb_arg)> is called
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index c453fb6e85..6d4d6292bc 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -124,8 +124,7 @@ apps:
 	@(cd ..; $(MAKE) DIRS=apps all)
 
 SET_SO_PATHS=LIBPATH="`cd ..; pwd`"; LD_LIBRARY_PATH="$$LIBPATH"; DYLD_LIBRARY_PATH="$$LIBPATH"; SHLIB_PATH="$$LIBPATH"; \
-		if [ "$(PLATFORM)" = "DJGPP" ]; then PATH="$$LIBPATH\;$$PATH";  \
-		elif [ "$(PLATFORM)" = "Cygwin" ]; then PATH="$${LIBPATH}:$$PATH"; fi; \
+		if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="$${LIBPATH}:$$PATH"; fi; \
 		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH
 
 alltests: \
diff --git a/util/cygwin.sh b/util/cygwin.sh
index 1bb5b95d1e..930f766b4f 100755
--- a/util/cygwin.sh
+++ b/util/cygwin.sh
@@ -114,13 +114,13 @@ strip usr/bin/*.exe usr/bin/*.dll
 # Runtime package
 find etc usr/bin usr/doc usr/ssl/certs usr/ssl/man/man[157] usr/ssl/misc \
      usr/ssl/openssl.cnf usr/ssl/private -empty -o \! -type d |
-tar cjfT openssl2-${VERSION}-${SUBVERSION}.tar.bz2 -
+tar cjfT openssl-${VERSION}-${SUBVERSION}.tar.bz2 -
 # Development package
 find usr/include usr/lib usr/ssl/man/man3 -empty -o \! -type d |
-tar cjfT openssl2-devel-${VERSION}-${SUBVERSION}.tar.bz2 -
+tar cjfT openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2 -
 
-ls -l openssl2-${VERSION}-${SUBVERSION}.tar.bz2
-ls -l openssl2-devel-${VERSION}-${SUBVERSION}.tar.bz2
+ls -l openssl-${VERSION}-${SUBVERSION}.tar.bz2
+ls -l openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2
 
 cleanup