diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2016-12-27 16:01:20 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2016-12-27 16:01:20 +0000 |
| commit | 73d76079553eefdd615014e043e69d00426c99d2 (patch) | |
| tree | 3f865ae2da375d594c180589865be04272b76166 /lib | |
| parent | 3734b9eec2add5f7865f4fc5fd4e1fa8169c98cd (diff) | |
Kill some #if 0 code that uses old-style ASN.1 encoding.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/ocsp/ocsp_ext.c | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/lib/libcrypto/ocsp/ocsp_ext.c b/lib/libcrypto/ocsp/ocsp_ext.c index edcf5bcca88..1f2563ca8ab 100644 --- a/lib/libcrypto/ocsp/ocsp_ext.c +++ b/lib/libcrypto/ocsp/ocsp_ext.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp_ext.c,v 1.14 2015/07/19 18:29:31 miod Exp $ */ +/* $OpenBSD: ocsp_ext.c,v 1.15 2016/12/27 16:01:19 jsing Exp $ */ /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL * project. */ @@ -314,50 +314,6 @@ OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc) return X509v3_add_ext(&(x->singleExtensions), ex, loc) != NULL; } -/* also CRL Entry Extensions */ -#if 0 -ASN1_STRING * -ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d, void *data, - STACK_OF(ASN1_OBJECT) *sk) -{ - int i; - unsigned char *p, *b = NULL; - - if (data) { - if ((i = i2d(data, NULL)) <= 0) - goto err; - if (!(b = p = malloc(i))) - goto err; - if (i2d(data, &p) <= 0) - goto err; - } else if (sk) { - if ((i = i2d_ASN1_SET_OF_ASN1_OBJECT(sk, NULL, - (I2D_OF(ASN1_OBJECT))i2d, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL, - IS_SEQUENCE)) <= 0) - goto err; - if (!(b = p = malloc(i))) - goto err; - if (i2d_ASN1_SET_OF_ASN1_OBJECT(sk, &p, - (I2D_OF(ASN1_OBJECT))i2d, V_ASN1_SEQUENCE, - V_ASN1_UNIVERSAL, IS_SEQUENCE) <= 0) - goto err; - } else { - OCSPerr(OCSP_F_ASN1_STRING_ENCODE, OCSP_R_BAD_DATA); - goto err; - } - if (!s && !(s = ASN1_STRING_new())) - goto err; - if (!(ASN1_STRING_set(s, b, i))) - goto err; - free(b); - return s; - -err: - free(b); - return NULL; -} -#endif - /* Nonce handling functions */ /* Add a nonce to an extension stack. A nonce can be specificed or if NULL |