Merge pull request #27 from jwillikers/feature/authentication-enhancements-doc

Add additional SHA authentication algorithms

Author: RincewindsHat

README.md

@@ -59,7 +59,7 @@ make install
      -s|--speed         override speed detection with this value (bits per sec)
      -x|--trim          cut this number of characters from the start of interface descriptions
                             Useful for nortel switches
-     -j|--auth-proto    SNMPv3 Auth Protocol (SHA|MD5)
+     -j|--auth-proto    SNMPv3 Auth Protocol (SHA|SHA-224|SHA-256|SHA-384|SHA-512|MD5)
      -J|--auth-phrase   SNMPv3 Auth Phrase
      -k|--priv-proto    SNMPv3 Privacy Protocol (AES|DES) (optional)
      -K|--priv-phrase   SNMPv3 Privacy Phrase

check_interfaces.c

@@ -1477,7 +1477,7 @@ int usage(char *progname) {
 		printf("%s%s", i ? "," : "", modes[i]);
 	}
 	printf(")\n");
-	printf(" -j|--auth-proto\tSNMPv3 Auth Protocol (SHA|MD5)\n");
+	printf(" -j|--auth-proto\tSNMPv3 Auth Protocol (SHA|SHA-224|SHA-256|SHA-384|SHA-512|MD5)\n");
 	printf(" -J|--auth-phrase\tSNMPv3 Auth Phrase\n");
 #ifdef usmDESPrivProtocol
 	printf(

snmp_bulkget.c

@@ -48,14 +48,16 @@
  *
  */
 
+#include <net-snmp/net-snmp-config.h>
+
 /* asprintf and getopt_long */
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#include <net-snmp/library/transform_oids.h>
 #endif
 #include <stdio.h>
 
 #include <limits.h>
-#include <net-snmp/net-snmp-config.h>
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
@@ -227,6 +229,22 @@ netsnmp_session *start_session_v3(netsnmp_session *session, char *user,
 			session->securityAuthProto = snmp_duplicate_objid(
 				usmHMACSHA1AuthProtocol, USM_AUTH_PROTO_SHA_LEN);
 			session->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN;
+		} else if (!strcmp(auth_proto, "SHA-224")) {
+			session->securityAuthProto = snmp_duplicate_objid(
+				usmHMAC128SHA224AuthProtocol, USM_AUTH_PROTO_SHA_LEN);
+			session->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN;
+		} else if (!strcmp(auth_proto, "SHA-256")) {
+			session->securityAuthProto = snmp_duplicate_objid(
+				usmHMAC192SHA256AuthProtocol, USM_AUTH_PROTO_SHA_LEN);
+			session->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN;
+		} else if (!strcmp(auth_proto, "SHA-384")) {
+			session->securityAuthProto = snmp_duplicate_objid(
+				usmHMAC256SHA384AuthProtocol, USM_AUTH_PROTO_SHA_LEN);
+			session->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN;
+		} else if (!strcmp(auth_proto, "SHA-512")) {
+			session->securityAuthProto = snmp_duplicate_objid(
+				usmHMAC384SHA512AuthProtocol, USM_AUTH_PROTO_SHA_LEN);
+			session->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN;
 		} else if (!strcmp(auth_proto, "MD5")) {
 			session->securityAuthProto = snmp_duplicate_objid(
 				usmHMACMD5AuthProtocol, USM_AUTH_PROTO_MD5_LEN);