X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fbio%2Fbio_lib.c;h=b72688ea901c1b2e6f7a6cb0662c24bf3e29d6c0;hb=019a7aba4a05afee1e59c2f8656ba0b319b2213b;hp=a73bca4b67d6f7f45a4d00244f0a96208484ca38;hpb=61f5b6f33807306d09bccbc2dcad474d1d04ca40;p=oweals%2Fopenssl.git

diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
index a73bca4b67..b72688ea90 100644
--- a/crypto/bio/bio_lib.c
+++ b/crypto/bio/bio_lib.c
@@ -58,10 +58,10 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "crypto.h"
+#include <openssl/crypto.h>
 #include "cryptlib.h"
-#include "bio.h"
-#include "stack.h"
+#include <openssl/bio.h>
+#include <openssl/stack.h>
 
 static STACK *bio_meth=NULL;
 static int bio_meth_num=0;
@@ -117,7 +117,7 @@ int BIO_free(BIO *a)
 #ifdef REF_PRINT
 	REF_PRINT("BIO",a);
 #endif
-        if (i > 0) return(1);
+	if (i > 0) return(1);
 #ifdef REF_CHECK
 	if (i < 0)
 		{
@@ -290,7 +290,7 @@ char *BIO_ptr_ctrl(BIO *b, int cmd, long larg)
 		return(p);
 	}
 
-long BIO_ctrl(BIO *b, int cmd, long larg, char *parg)
+long BIO_ctrl(BIO *b, int cmd, long larg, void *parg)
 	{
 	long ret;
 	long (*cb)();
@@ -317,6 +317,20 @@ long BIO_ctrl(BIO *b, int cmd, long larg, char *parg)
 	return(ret);
 	}
 
+/* It is unfortunate to duplicate in functions what the BIO_(w)pending macros
+ * do; but those macros have inappropriate return type, and for interfacing
+ * from other programming languages, C macros aren't much of a help anyway. */
+size_t BIO_ctrl_pending(BIO *bio)
+    {
+	return BIO_ctrl(bio, BIO_CTRL_PENDING, 0, NULL);
+	}
+
+size_t BIO_ctrl_wpending(BIO *bio)
+    {
+	return BIO_ctrl(bio, BIO_CTRL_WPENDING, 0, NULL);
+	}
+
+
 /* put the 'bio' on the end of b's list of operators */
 BIO *BIO_push(BIO *b, BIO *bio)
 	{
@@ -434,9 +448,9 @@ BIO *BIO_dup_chain(BIO *in)
 			goto err;
 			}
 
-	        /* copy app data */
-	        if (!CRYPTO_dup_ex_data(bio_meth,&new->ex_data,&bio->ex_data))
-	                goto err;
+		/* copy app data */
+		if (!CRYPTO_dup_ex_data(bio_meth,&new->ex_data,&bio->ex_data))
+			goto err;
 
 		if (ret == NULL)
 			{
@@ -464,11 +478,11 @@ void BIO_copy_next_retry(BIO *b)
 
 int BIO_get_ex_new_index(long argl, char *argp, int (*new_func)(),
 	     int (*dup_func)(), void (*free_func)())
-        {
-        bio_meth_num++;
-        return(CRYPTO_get_ex_new_index(bio_meth_num-1,&bio_meth,
-                argl,argp,new_func,dup_func,free_func));
-        }
+	{
+	bio_meth_num++;
+	return(CRYPTO_get_ex_new_index(bio_meth_num-1,&bio_meth,
+		argl,argp,new_func,dup_func,free_func));
+	}
 
 int BIO_set_ex_data(BIO *bio, int idx, char *data)
 	{