upd: openssl to 1.1.0

[cassiopeia.git] / lib / openssl / crypto / comp / comp_lib.c

diff --git a/lib/openssl/crypto/comp/comp_lib.c b/lib/openssl/crypto/comp/comp_lib.c
index b60ae371e8d133da1fb3af17df26b68dd205ccdb..32afd0dba8185a0131c41e778dd215d41bab8c9f 100644 (file)
--- a/lib/openssl/crypto/comp/comp_lib.c
+++ b/lib/openssl/crypto/comp/comp_lib.c
@@ -1,72 +1,91 @@
+/*
+ * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <openssl/objects.h>
 #include <openssl/comp.h>
+#include "comp_lcl.h"
 
 COMP_CTX *COMP_CTX_new(COMP_METHOD *meth)
-       {
-       COMP_CTX *ret;
+{
+    COMP_CTX *ret;
+
+    if ((ret = OPENSSL_zalloc(sizeof(*ret))) == NULL)
+        return (NULL);
+    ret->meth = meth;
+    if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {
+        OPENSSL_free(ret);
+        ret = NULL;
+    }
+    return (ret);
+}
+
+const COMP_METHOD *COMP_CTX_get_method(const COMP_CTX *ctx)
+{
+    return ctx->meth;
+}
 
-       if ((ret=(COMP_CTX *)OPENSSL_malloc(sizeof(COMP_CTX))) == NULL)
-               {
-               /* ZZZZZZZZZZZZZZZZ */
-               return(NULL);
-               }
-       memset(ret,0,sizeof(COMP_CTX));
-       ret->meth=meth;
-       if ((ret->meth->init != NULL) && !ret->meth->init(ret))
-               {
-               OPENSSL_free(ret);
-               ret=NULL;
-               }
-       return(ret);
-       }
+int COMP_get_type(const COMP_METHOD *meth)
+{
+    return meth->type;
+}
+
+const char *COMP_get_name(const COMP_METHOD *meth)
+{
+    return meth->name;
+}
 
 void COMP_CTX_free(COMP_CTX *ctx)
-       {
-       if(ctx == NULL)
-           return;
+{
+    if (ctx == NULL)
+        return;
 
-       if (ctx->meth->finish != NULL)
-               ctx->meth->finish(ctx);
+    if (ctx->meth->finish != NULL)
+        ctx->meth->finish(ctx);
 
-       OPENSSL_free(ctx);
-       }
+    OPENSSL_free(ctx);
+}
 
 int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
-            unsigned char *in, int ilen)
-       {
-       int ret;
-       if (ctx->meth->compress == NULL)
-               {
-               /* ZZZZZZZZZZZZZZZZZ */
-               return(-1);
-               }
-       ret=ctx->meth->compress(ctx,out,olen,in,ilen);
-       if (ret > 0)
-               {
-               ctx->compress_in+=ilen;
-               ctx->compress_out+=ret;
-               }
-       return(ret);
-       }
+                        unsigned char *in, int ilen)
+{
+    int ret;
+    if (ctx->meth->compress == NULL) {
+        return (-1);
+    }
+    ret = ctx->meth->compress(ctx, out, olen, in, ilen);
+    if (ret > 0) {
+        ctx->compress_in += ilen;
+        ctx->compress_out += ret;
+    }
+    return (ret);
+}
 
 int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
-            unsigned char *in, int ilen)
-       {
-       int ret;
+                      unsigned char *in, int ilen)
+{
+    int ret;
+
+    if (ctx->meth->expand == NULL) {
+        return (-1);
+    }
+    ret = ctx->meth->expand(ctx, out, olen, in, ilen);
+    if (ret > 0) {
+        ctx->expand_in += ilen;
+        ctx->expand_out += ret;
+    }
+    return (ret);
+}
 
-       if (ctx->meth->expand == NULL)
-               {
-               /* ZZZZZZZZZZZZZZZZZ */
-               return(-1);
-               }
-       ret=ctx->meth->expand(ctx,out,olen,in,ilen);
-       if (ret > 0)
-               {
-               ctx->expand_in+=ilen;
-               ctx->expand_out+=ret;
-               }
-       return(ret);
-       }
+int COMP_CTX_get_type(const COMP_CTX* comp)
+{
+    return comp->meth ? comp->meth->type : NID_undef;
+}