You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by do...@apache.org on 2002/03/13 19:42:05 UTC
cvs commit: httpd-2.0/modules/ssl ssl_util.c mod_ssl.h
dougm 02/03/13 10:42:05
Modified: modules/ssl ssl_util.c mod_ssl.h
Log:
add ssl_asn1_table_keyfmt() function for clarity
Revision Changes Path
1.27 +14 -0 httpd-2.0/modules/ssl/ssl_util.c
Index: ssl_util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ssl_util.c 13 Mar 2002 04:14:43 -0000 1.26
+++ ssl_util.c 13 Mar 2002 18:42:05 -0000 1.27
@@ -373,6 +373,20 @@
apr_hash_set(table, key, klen, NULL);
}
+static const char *ssl_asn1_key_types[] = {"RSA", "DSA"};
+
+const char *ssl_asn1_table_keyfmt(apr_pool_t *p,
+ const char *id,
+ int keytype)
+{
+ if (keytype >= SSL_AIDX_MAX) {
+ return NULL;
+ }
+
+ return apr_pstrcat(p, id, ":",
+ ssl_asn1_key_types[keytype], NULL);
+}
+
#if APR_HAS_THREADS
/*
* To ensure thread-safetyness in OpenSSL - work in progress
1.77 +3 -0 httpd-2.0/modules/ssl/mod_ssl.h
Index: mod_ssl.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- mod_ssl.h 13 Mar 2002 04:59:19 -0000 1.76
+++ mod_ssl.h 13 Mar 2002 18:42:05 -0000 1.77
@@ -713,6 +713,9 @@
void ssl_asn1_table_unset(apr_hash_t *table,
const char *key);
+const char *ssl_asn1_table_keyfmt(apr_pool_t *p,
+ const char *id,
+ int keytype);
/* Mutex Support */
int ssl_mutex_init(server_rec *, apr_pool_t *);
int ssl_mutex_reinit(server_rec *, apr_pool_t *);