From: Richard Levitte <levitte@openssl.org>
Date: Tue, 30 Mar 2004 16:40:09 +0000 (+0000)
Subject: Recent changes from 0.9.6-stable.
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d994be050839f1698a2b15b727c5e2ee4d2f1337;p=oweals%2Fopenssl.git

Recent changes from 0.9.6-stable.
---

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index f64c7383b2..767d2c70d6 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -138,6 +138,7 @@ int RAND_write_file(const char *file)
 	int n;
 	
 #if defined(O_CREAT) && !defined(WIN32)
+	{
 	/* For some reason Win32 can't write to files created this way */
 	
 	/* chmod(..., 0600) is too late to protect the file,
@@ -145,6 +146,7 @@ int RAND_write_file(const char *file)
 	int fd = open(file, O_CREAT, 0600);
 	if (fd != -1)
 		out = fdopen(fd, "wb");
+	}
 #endif
 	if (out == NULL)
 		out = fopen(file,"wb");
diff --git a/doc/crypto/RSA_public_encrypt.pod b/doc/crypto/RSA_public_encrypt.pod
index 9ae5f93152..6ab2bb8a1b 100644
--- a/doc/crypto/RSA_public_encrypt.pod
+++ b/doc/crypto/RSA_public_encrypt.pod
@@ -47,9 +47,10 @@ Encrypting user data directly with RSA is insecure.
 =back
 
 B<flen> must be less than RSA_size(B<rsa>) - 11 for the PKCS #1 v1.5
-based padding modes, and less than RSA_size(B<rsa>) - 41 for
-RSA_PKCS1_OAEP_PADDING. The random number generator must be seeded
-prior to calling RSA_public_encrypt().
+based padding modes, less than RSA_size(B<rsa>) - 41 for
+RSA_PKCS1_OAEP_PADDING and exactly RSA_size(B<rsa>) for RSA_NO_PADDING.
+The random number generator must be seeded prior to calling
+RSA_public_encrypt().
 
 RSA_private_decrypt() decrypts the B<flen> bytes at B<from> using the
 private key B<rsa> and stores the plaintext in B<to>. B<to> must point