| Index: openssl/crypto/asn1/x_info.c
|
| diff --git a/openssl/crypto/asn1/x_info.c b/openssl/crypto/asn1/x_info.c
|
| deleted file mode 100644
|
| index d44f6cdb0197a2133d2d065a0224fe99ee0b4fce..0000000000000000000000000000000000000000
|
| --- a/openssl/crypto/asn1/x_info.c
|
| +++ /dev/null
|
| @@ -1,114 +0,0 @@
|
| -/* crypto/asn1/x_info.c */
|
| -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
| - * All rights reserved.
|
| - *
|
| - * This package is an SSL implementation written
|
| - * by Eric Young (eay@cryptsoft.com).
|
| - * The implementation was written so as to conform with Netscapes SSL.
|
| - *
|
| - * This library is free for commercial and non-commercial use as long as
|
| - * the following conditions are aheared to. The following conditions
|
| - * apply to all code found in this distribution, be it the RC4, RSA,
|
| - * lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
| - * included with this distribution is covered by the same copyright terms
|
| - * except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
| - *
|
| - * Copyright remains Eric Young's, and as such any Copyright notices in
|
| - * the code are not to be removed.
|
| - * If this package is used in a product, Eric Young should be given attribution
|
| - * as the author of the parts of the library used.
|
| - * This can be in the form of a textual message at program startup or
|
| - * in documentation (online or textual) provided with the package.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions
|
| - * are met:
|
| - * 1. Redistributions of source code must retain the copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright
|
| - * notice, this list of conditions and the following disclaimer in the
|
| - * documentation and/or other materials provided with the distribution.
|
| - * 3. All advertising materials mentioning features or use of this software
|
| - * must display the following acknowledgement:
|
| - * "This product includes cryptographic software written by
|
| - * Eric Young (eay@cryptsoft.com)"
|
| - * The word 'cryptographic' can be left out if the rouines from the library
|
| - * being used are not cryptographic related :-).
|
| - * 4. If you include any Windows specific code (or a derivative thereof) from
|
| - * the apps directory (application code) you must include an acknowledgement:
|
| - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
| - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
| - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
| - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
| - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
| - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
| - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
| - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
| - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
| - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
| - * SUCH DAMAGE.
|
| - *
|
| - * The licence and distribution terms for any publically available version or
|
| - * derivative of this code cannot be changed. i.e. this code cannot simply be
|
| - * copied and put under another distribution licence
|
| - * [including the GNU Public Licence.]
|
| - */
|
| -
|
| -#include <stdio.h>
|
| -#include "cryptlib.h"
|
| -#include <openssl/evp.h>
|
| -#include <openssl/asn1.h>
|
| -#include <openssl/x509.h>
|
| -
|
| -X509_INFO *X509_INFO_new(void)
|
| - {
|
| - X509_INFO *ret=NULL;
|
| -
|
| - ret=(X509_INFO *)OPENSSL_malloc(sizeof(X509_INFO));
|
| - if (ret == NULL)
|
| - {
|
| - ASN1err(ASN1_F_X509_INFO_NEW,ERR_R_MALLOC_FAILURE);
|
| - return(NULL);
|
| - }
|
| -
|
| - ret->enc_cipher.cipher=NULL;
|
| - ret->enc_len=0;
|
| - ret->enc_data=NULL;
|
| -
|
| - ret->references=1;
|
| - ret->x509=NULL;
|
| - ret->crl=NULL;
|
| - ret->x_pkey=NULL;
|
| - return(ret);
|
| - }
|
| -
|
| -void X509_INFO_free(X509_INFO *x)
|
| - {
|
| - int i;
|
| -
|
| - if (x == NULL) return;
|
| -
|
| - i=CRYPTO_add(&x->references,-1,CRYPTO_LOCK_X509_INFO);
|
| -#ifdef REF_PRINT
|
| - REF_PRINT("X509_INFO",x);
|
| -#endif
|
| - if (i > 0) return;
|
| -#ifdef REF_CHECK
|
| - if (i < 0)
|
| - {
|
| - fprintf(stderr,"X509_INFO_free, bad reference count\n");
|
| - abort();
|
| - }
|
| -#endif
|
| -
|
| - if (x->x509 != NULL) X509_free(x->x509);
|
| - if (x->crl != NULL) X509_CRL_free(x->crl);
|
| - if (x->x_pkey != NULL) X509_PKEY_free(x->x_pkey);
|
| - if (x->enc_data != NULL) OPENSSL_free(x->enc_data);
|
| - OPENSSL_free(x);
|
| - }
|
| -
|
| -IMPLEMENT_STACK_OF(X509_INFO)
|
| -
|
|
|