Addapt seldom compiled code to new semantics of the key schedule (not

[openssl.git] / crypto / asn1 / t_x509.c

diff --git a/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c
index 22b547d7925c788ad5c115e0cbe4861096561e24..454c695eb2aa43d62fb07880b730fc067c75df59 100644 (file)
--- a/crypto/asn1/t_x509.c
+++ b/crypto/asn1/t_x509.c
@@ -112,7 +112,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
 
        if((nmflags & XN_FLAG_SEP_MASK) == XN_FLAG_SEP_MULTILINE) {
                        mlch = '\n';
-                       nmindent = 16;
+                       nmindent = 12;
        }
 
        if(nmflags == X509_FLAG_COMPAT)
@@ -176,11 +176,12 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
        if(!(cflag & X509_FLAG_NO_ISSUER))
                {
                if (BIO_printf(bp,"        Issuer:%c",mlch) <= 0) goto err;
-               if (!X509_NAME_print_ex(bp,X509_get_issuer_name(x),nmindent, nmflags)) goto err;
+               if (X509_NAME_print_ex(bp,X509_get_issuer_name(x),nmindent, nmflags) < 0) goto err;
+               if (BIO_write(bp,"\n",1) <= 0) goto err;
                }
        if(!(cflag & X509_FLAG_NO_VALIDITY))
                {
-               if (BIO_write(bp,"\n        Validity\n",18) <= 0) goto err;
+               if (BIO_write(bp,"        Validity\n",17) <= 0) goto err;
                if (BIO_write(bp,"            Not Before: ",24) <= 0) goto err;
                if (!ASN1_TIME_print(bp,X509_get_notBefore(x))) goto err;
                if (BIO_write(bp,"\n            Not After : ",25) <= 0) goto err;
@@ -190,11 +191,12 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
        if(!(cflag & X509_FLAG_NO_SUBJECT))
                {
                if (BIO_printf(bp,"        Subject:%c",mlch) <= 0) goto err;
-               if (!X509_NAME_print_ex(bp,X509_get_subject_name(x),nmindent, nmflags)) goto err;
+               if (X509_NAME_print_ex(bp,X509_get_subject_name(x),nmindent, nmflags) < 0) goto err;
+               if (BIO_write(bp,"\n",1) <= 0) goto err;
                }
        if(!(cflag & X509_FLAG_NO_PUBKEY))
                {
-               if (BIO_write(bp,"\n        Subject Public Key Info:\n",34) <= 0)
+               if (BIO_write(bp,"        Subject Public Key Info:\n",33) <= 0)
                        goto err;
                if (BIO_printf(bp,"%12sPublic Key Algorithm: ","") <= 0)
                        goto err;
@@ -257,7 +259,6 @@ int X509_ocspid_print (BIO *bp, X509 *x)
        unsigned char *dertmp;
        int derlen;
        int i;
-       SHA_CTX SHA1buf ;
        unsigned char SHA1md[SHA_DIGEST_LENGTH];
 
        /* display the hash of the subject as it would appear
@@ -269,9 +270,7 @@ int X509_ocspid_print (BIO *bp, X509 *x)
                goto err;
        i2d_X509_NAME(x->cert_info->subject, &dertmp);
 
-       SHA1_Init(&SHA1buf);
-       SHA1_Update(&SHA1buf, der, derlen);
-       SHA1_Final(SHA1md,&SHA1buf);
+       EVP_Digest(der, derlen, SHA1md, NULL, EVP_sha1());
        for (i=0; i < SHA_DIGEST_LENGTH; i++)
                {
                if (BIO_printf(bp,"%02X",SHA1md[i]) <= 0) goto err;
@@ -284,10 +283,8 @@ int X509_ocspid_print (BIO *bp, X509 *x)
        if (BIO_printf(bp,"\n        Public key OCSP hash: ") <= 0)
                goto err;
 
-       SHA1_Init(&SHA1buf);
-       SHA1_Update(&SHA1buf, x->cert_info->key->public_key->data,
-               x->cert_info->key->public_key->length);
-       SHA1_Final(SHA1md,&SHA1buf);
+       EVP_Digest(x->cert_info->key->public_key->data,
+               x->cert_info->key->public_key->length, SHA1md, NULL, EVP_sha1());
        for (i=0; i < SHA_DIGEST_LENGTH; i++)
                {
                if (BIO_printf(bp,"%02X",SHA1md[i]) <= 0)
@@ -443,6 +440,8 @@ int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
        ll=80-2-obase;
 
        s=X509_NAME_oneline(name,buf,256);
+       if (!*s)
+               return 1;
        s++; /* skip the first slash */
 
        l=ll;