diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ca.c | 6 | ||||
| -rw-r--r-- | apps/progs.h | 6 | ||||
| -rw-r--r-- | apps/req.c | 2 | ||||
| -rw-r--r-- | apps/s_server.c | 2 | ||||
| -rw-r--r-- | apps/s_socket.c | 5 | ||||
| -rw-r--r-- | apps/x509.c | 2 |
6 files changed, 14 insertions, 9 deletions
@@ -1012,7 +1012,7 @@ bad: r->sequence=i; } - /* we how have a CRL */ + /* we now have a CRL */ if (verbose) BIO_printf(bio_err,"signing CRL\n"); if (md != NULL) { @@ -1024,6 +1024,10 @@ bad: } else dgst=EVP_md5(); +#ifndef NO_DSA + if (pkey->type == EVP_PKEY_DSA) + dgst = EVP_dss1() ; +#endif if (!X509_CRL_sign(crl,pkey,dgst)) goto err; PEM_write_bio_X509_CRL(Sout,crl); diff --git a/apps/progs.h b/apps/progs.h index 578bfcf510..9ed1f4bf5a 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -65,9 +65,7 @@ typedef struct { FUNCTION functions[] = { {FUNC_TYPE_GENERAL,"verify",verify_main}, {FUNC_TYPE_GENERAL,"asn1parse",asn1parse_main}, -#ifndef NO_RSA {FUNC_TYPE_GENERAL,"req",req_main}, -#endif {FUNC_TYPE_GENERAL,"dgst",dgst_main}, #ifndef NO_DH {FUNC_TYPE_GENERAL,"dh",dh_main}, @@ -77,9 +75,7 @@ FUNCTION functions[] = { {FUNC_TYPE_GENERAL,"gendh",gendh_main}, #endif {FUNC_TYPE_GENERAL,"errstr",errstr_main}, -#ifndef NO_RSA {FUNC_TYPE_GENERAL,"ca",ca_main}, -#endif {FUNC_TYPE_GENERAL,"crl",crl_main}, #ifndef NO_RSA {FUNC_TYPE_GENERAL,"rsa",rsa_main}, @@ -90,9 +86,7 @@ FUNCTION functions[] = { #ifndef NO_DSA {FUNC_TYPE_GENERAL,"dsaparam",dsaparam_main}, #endif -#ifndef NO_RSA {FUNC_TYPE_GENERAL,"x509",x509_main}, -#endif #ifndef NO_RSA {FUNC_TYPE_GENERAL,"genrsa",genrsa_main}, #endif diff --git a/apps/req.c b/apps/req.c index 9af5b49570..50802f52ca 100644 --- a/apps/req.c +++ b/apps/req.c @@ -718,9 +718,11 @@ loop: goto end; } fprintf(stdout,"Modulus="); +#ifndef NO_RSA if (pubkey->type == EVP_PKEY_RSA) BN_print(out,pubkey->pkey.rsa->n); else +#endif fprintf(stdout,"Wrong Algorithm type"); fprintf(stdout,"\n"); } diff --git a/apps/s_server.c b/apps/s_server.c index c9651b84af..e96fd9cdb8 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -189,7 +189,7 @@ static void sv_usage() { BIO_printf(bio_err,"usage: s_server [args ...]\n"); BIO_printf(bio_err,"\n"); - BIO_printf(bio_err," -accept arg - port to accept on (default is %d\n",PORT); + BIO_printf(bio_err," -accept arg - port to accept on (default is %d)\n",PORT); BIO_printf(bio_err," -verify arg - turn on peer certificate verification\n"); BIO_printf(bio_err," -Verify arg - turn on peer certificate verification, must have a cert.\n"); BIO_printf(bio_err," -cert arg - certificate file to use, PEM format assumed\n"); diff --git a/apps/s_socket.c b/apps/s_socket.c index 4bc3fde925..5c171c31ae 100644 --- a/apps/s_socket.c +++ b/apps/s_socket.c @@ -332,7 +332,12 @@ char *ip; if (ip == NULL) server.sin_addr.s_addr=INADDR_ANY; else +/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */ +#ifndef BIT_FIELD_LIMITS memcpy(&server.sin_addr.s_addr,ip,4); +#else + memcpy(&server.sin_addr,ip,4); +#endif s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL); if (s == INVALID_SOCKET) goto err; diff --git a/apps/x509.c b/apps/x509.c index 94d57bb3d2..1d7bad111a 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -110,7 +110,7 @@ static char *x509_usage[]={ " missing, it is asssumed to be in the CA file.\n", " -CAcreateserial - create serial number file if it does not exist\n", " -CAserial - serial file\n", -" -text - print the certitificate in text form\n", +" -text - print the certificate in text form\n", " -C - print out C code forms\n", " -md2/-md5/-sha1/-mdc2 - digest to do an RSA sign with\n", NULL |