Remove NOPROTO definitions and error code comments.

[openssl.git] / crypto / evp / bio_enc.c

diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
index 6020736fd06cefee3acee7f1f86daf60a14db96e..0a7b1ecf07cb11309e1321992c494daeea1649b2 100644 (file)
--- a/crypto/evp/bio_enc.c
+++ b/crypto/evp/bio_enc.c
@@ -1,5 +1,5 @@
 /* crypto/evp/bio_enc.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -59,10 +59,9 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "evp.h"
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
 
-#ifndef NOPROTO
 static int enc_write(BIO *h,char *buf,int num);
 static int enc_read(BIO *h,char *buf,int size);
 /*static int enc_puts(BIO *h,char *str); */
@@ -70,16 +69,6 @@ static int enc_read(BIO *h,char *buf,int size);
 static long enc_ctrl(BIO *h,int cmd,long arg1,char *arg2);
 static int enc_new(BIO *h);
 static int enc_free(BIO *data);
-#else
-static int enc_write();
-static int enc_read();
-/*static int enc_puts(); */
-/*static int enc_gets(); */
-static long enc_ctrl();
-static int enc_new();
-static int enc_free();
-#endif
-
 #define ENC_BLOCK_SIZE (1024*4)
 
 typedef struct enc_struct
@@ -105,17 +94,17 @@ static BIO_METHOD methods_enc=
        enc_free,
        };
 
-BIO_METHOD *BIO_f_cipher()
+BIO_METHOD *BIO_f_cipher(void)
        {
        return(&methods_enc);
        }
 
-static int enc_new(bi)
-BIO *bi;
+static int enc_new(BIO *bi)
        {
        BIO_ENC_CTX *ctx;
 
        ctx=(BIO_ENC_CTX *)Malloc(sizeof(BIO_ENC_CTX));
+       EVP_CIPHER_CTX_init(&ctx->cipher);
        if (ctx == NULL) return(0);
 
        ctx->buf_len=0;
@@ -130,8 +119,7 @@ BIO *bi;
        return(1);
        }
 
-static int enc_free(a)
-BIO *a;
+static int enc_free(BIO *a)
        {
        BIO_ENC_CTX *b;
 
@@ -146,10 +134,7 @@ BIO *a;
        return(1);
        }
        
-static int enc_read(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+static int enc_read(BIO *b, char *out, int outl)
        {
        int ret=0,i;
        BIO_ENC_CTX *ctx;
@@ -229,10 +214,7 @@ int outl;
        return((ret == 0)?ctx->cont:ret);
        }
 
-static int enc_write(b,in,inl)
-BIO *b;
-char *in;
-int inl;
+static int enc_write(BIO *b, char *in, int inl)
        {
        int ret=0,n,i;
        BIO_ENC_CTX *ctx;
@@ -287,16 +269,13 @@ int inl;
        return(ret);
        }
 
-static long enc_ctrl(b,cmd,num,ptr)
-BIO *b;
-int cmd;
-long num;
-char *ptr;
+static long enc_ctrl(BIO *b, int cmd, long num, char *ptr)
        {
        BIO *dbio;
        BIO_ENC_CTX *ctx,*dctx;
        long ret=1;
        int i;
+       EVP_CIPHER_CTX **c_ctx;
 
        ctx=(BIO_ENC_CTX *)b->ptr;
 
@@ -363,7 +342,11 @@ again:
                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
                BIO_copy_next_retry(b);
                break;
-
+       case BIO_C_GET_CIPHER_CTX:
+               c_ctx=(EVP_CIPHER_CTX **)ptr;
+               (*c_ctx)= &(ctx->cipher);
+               b->init=1;
+               break;
        case BIO_CTRL_DUP:
                dbio=(BIO *)ptr;
                dctx=(BIO_ENC_CTX *)dbio->ptr;
@@ -377,19 +360,35 @@ again:
        return(ret);
        }
 
-void BIO_set_cipher(b,c,k,i,e)
+/*
+void BIO_set_cipher_ctx(b,c)
 BIO *b;
-EVP_CIPHER *c;
-unsigned char *k;
-unsigned char *i;
-int e;
+EVP_CIPHER_ctx *c;
+       {
+       if (b == NULL) return;
+
+       if ((b->callback != NULL) &&
+               (b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,0L) <= 0))
+               return;
+
+       b->init=1;
+       ctx=(BIO_ENC_CTX *)b->ptr;
+       memcpy(ctx->cipher,c,sizeof(EVP_CIPHER_CTX));
+       
+       if (b->callback != NULL)
+               b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,1L);
+       }
+*/
+
+void BIO_set_cipher(BIO *b, const EVP_CIPHER *c, unsigned char *k,
+            unsigned char *i, int e)
        {
        BIO_ENC_CTX *ctx;
 
        if (b == NULL) return;
 
        if ((b->callback != NULL) &&
-               (b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,0L) <= 0))
+               (b->callback(b,BIO_CB_CTRL,(const char *)c,BIO_CTRL_SET,e,0L) <= 0))
                return;
 
        b->init=1;
@@ -397,6 +396,6 @@ int e;
        EVP_CipherInit(&(ctx->cipher),c,k,i,e);
        
        if (b->callback != NULL)
-               b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,1L);
+               b->callback(b,BIO_CB_CTRL,(const char *)c,BIO_CTRL_SET,e,1L);
        }